Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
VenJob
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Đường Sỹ Hoàng
  • VenJob
  • Merge Requests
  • !6

Closed
Opened Dec 26, 2019 by Đường Sỹ Hoàng@hoangds 
  • Report abuse
Report abuse

User login

User login

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/login origin/feature/login

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff feature/login

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 8
  • Commits 2
  • Changes 8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • ceb7af4b - User Login

    Compare with previous version

    Dec 26, 2019

    added 1 commit

    • ceb7af4b - User Login

    Compare with previous version

    added 1 commit * ceb7af4b - User Login [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4557&start_sha=9c7afa53128b0d9bdb2885ff55ffee795efe5543)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 89ccbb41 - User Login

    Compare with previous version

    Dec 26, 2019

    added 1 commit

    • 89ccbb41 - User Login

    Compare with previous version

    added 1 commit * 89ccbb41 - User Login [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4558&start_sha=ceb7af4b70b0b41228ec3de390e188fe8cfd4865)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • c3933c99 - Fix devise default view

    Compare with previous version

    Dec 26, 2019

    added 1 commit

    • c3933c99 - Fix devise default view

    Compare with previous version

    added 1 commit * c3933c99 - Fix devise default view [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4559&start_sha=89ccbb4104b7068bfa744645c86cf5e96aafe6bb)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 04a385a2 - Update user login form

    Compare with previous version

    Dec 26, 2019

    added 1 commit

    • 04a385a2 - Update user login form

    Compare with previous version

    added 1 commit * 04a385a2 - Update user login form [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4560&start_sha=c3933c9914335a758d5de6fc423277ab0924df0c)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • e2042cdf - User/Register/Show

    Compare with previous version

    Dec 31, 2019

    added 1 commit

    • e2042cdf - User/Register/Show

    Compare with previous version

    added 1 commit * e2042cdf - User/Register/Show [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4568&start_sha=04a385a2269608a2b4f025662b14d97c0ba519c9)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 06198e67 - Fixed indent

    Compare with previous version

    Dec 31, 2019

    added 1 commit

    • 06198e67 - Fixed indent

    Compare with previous version

    added 1 commit * 06198e67 - Fixed indent [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4569&start_sha=e2042cdff5e06910a344797119379dc7f418c8e1)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 45a665a6 - Fixed sign_in users info

    Compare with previous version

    Dec 31, 2019

    added 1 commit

    • 45a665a6 - Fixed sign_in users info

    Compare with previous version

    added 1 commit * 45a665a6 - Fixed sign_in users info [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4570&start_sha=06198e6784c053512ee89c8cecd523b95f9c6d8d)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on the diff Dec 31, 2019
    Last updated by Đường Sỹ Hoàng Dec 31, 2019
    config/routes.rb
    3 3 resources :cities, only: :index
    4 4 resources :industries, only: :index
    5 5 resource :top, only: :index
    6 resource :users, only: :show
    6 7 devise_for :users
    8 as :user do
    9 get "login" , to: "devise/sessions#new"
    10 get "/users/sign_up", to: "devise/registrations#new"
    11 get "my/info", to: "devise/registrations#edit"
    12 get "my/", to: "users#show"
    • Son Do Hong @sondh commented Dec 31, 2019
      Master

      a nghĩ có thể đặt tên dễ hiểu hơn ví dụ

      /my_page
      /my_page/edit
      a nghĩ có thể đặt tên dễ hiểu hơn ví dụ ```ruby /my_page /my_page/edit ```
    • Đường Sỹ Hoàng @hoangds commented Dec 31, 2019
      Master

      Dạ cái này em đặt theo tên trong project VenJob nó qui định ban đầu là vậy.

      Dạ cái này em đặt theo tên trong project VenJob nó qui định ban đầu là vậy.
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 31, 2019
    Last updated by Son Do Hong Jan 02, 2020
    app/views/devise/registrations/new.html.erb 0 → 100644
    1 <div class="container">
    2 <div class="d-flex justify-content-center h-100">
    • Son Do Hong @sondh commented Dec 31, 2019
      Master

      indent

      indent
    • Son Do Hong @sondh

      changed this line in version 9 of the diff

      Jan 02, 2020

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4568#3f5f33da115bf173e0bae0a1ac8ef10f2438c0c8_0_2)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 31, 2019
    Last updated by Son Do Hong Jan 02, 2020
    app/views/devise/sessions/new.html.erb 0 → 100644
    1 </br>
    2
    3 <div class="container">
    4 <div class="d-flex justify-content-center h-100">
    • Son Do Hong @sondh commented Dec 31, 2019
      Master

      căn lề bằng space thay vì tab

      căn lề bằng space thay vì tab
    • Son Do Hong @sondh

      changed this line in version 9 of the diff

      Jan 02, 2020

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/6/diffs?diff_id=4568#08409c853905fab195e12ec49b3d919f3d6a2b9c_0_4)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Dec 31, 2019
    config/routes.rb
    3 3 resources :cities, only: :index
    4 4 resources :industries, only: :index
    5 5 resource :top, only: :index
    6 resource :users, only: :show
    6 7 devise_for :users
    8 as :user do
    9 get "login" , to: "devise/sessions#new"
    10 get "/users/sign_up", to: "devise/registrations#new"
    • Son Do Hong @sondh commented Dec 31, 2019
      Master

      đây là config mặc định của devise rồi, k cần thêm

      đây là config mặc định của devise rồi, k cần thêm
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Jan 02, 2020
    app/controllers/users_controller.rb 0 → 100644
    1 class UsersController < ApplicationController
    2 def show
    3 @user = User.find_by(params[:id])
    • Son Do Hong @sondh commented Jan 02, 2020
      Master

      kiểm tra lại

      kiểm tra lại
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Jan 02, 2020
    app/assets/stylesheets/users.scss 0 → 100644
    1 // Place all the styles related to the users controller here.
    2 // They will automatically be included in application.css.
    • Son Do Hong @sondh commented Jan 02, 2020
      Master

      remove this file

      remove this file
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Jan 02, 2020
    app/helpers/users_helper.rb 0 → 100644
    1 module UsersHelper
    2 end
    • Son Do Hong @sondh commented Jan 02, 2020
      Master

      remove this file

      remove this file
    Please register or sign in to reply
  • Son Do Hong @sondh

    closed

    Jan 03, 2020

    closed

    closed
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hoangds/VenJob!6