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 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Nguyen Ngoc Nghia
  • VeNJOB
  • Merge Requests
  • !10

Merged
Opened Dec 10, 2019 by Nguyen Ngoc Nghia@nghiann 
  • Report abuse
Report abuse

Feature: my page & user information edit

×

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/user_information origin/feature/user_information

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/user_information

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 5
  • Commits 4
  • Changes 6
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 10, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 10, 2019
    config/routes.rb
    6 6 devise_for :users
    7 7 root "static_pages#index"
    8 8 get "static_pages/index"
    9 get "my", to: "users/my_page#index"
    • Son Do Hong @sondh commented Dec 10, 2019
      Master

      dùng resource đi e

      dùng resource đi e
    • Son Do Hong @sondh commented Dec 10, 2019
      Master
      namespace :users do
        resource :my_page, only: :show
      end
      • my_pages_controller.rb
      • folder my_pages
      ``` namespace :users do resource :my_page, only: :show end ``` - `my_pages_controller.rb` - folder `my_pages`
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 10, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/10/diffs?diff_id=4442&start_sha=b29eef0919ede390492f10457f1f8e070b6cbd70#e801163eb9182955dca3eb9817d59af634f6665d_9_9)
      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 10, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 10, 2019
    app/views/users/my_page/index.html.erb 0 → 100644
    1 <h1>My Page</h1>
    2
    3 <div class="container">
    4 <h3>Email: <%= current_user.email %></h3>
    5 <h3>Full name: <%= current_user.first_name %> <%= current_user.last_name %></h3>
    6 <h3>My CV: <%= current_user.cv_path %></h3>
    7 <br>
    8 <%= link_to "Update", edit_user_registration_path, class: "btn btn-lg btn-primary" %>
    • Son Do Hong @sondh commented Dec 10, 2019
      Master

      link_to "Update" => link_to "Edit"

      `link_to "Update"` => `link_to "Edit"`
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 10, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/10/diffs?diff_id=4442&start_sha=b29eef0919ede390492f10457f1f8e070b6cbd70#73f2ab61724b8a8643360b98661df13ab5161dfb_8_0)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Dec 10, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 10, 2019
    app/controllers/users/registrations_controller.rb 0 → 100644
    1 class Users::RegistrationsController < Devise::RegistrationsController
    2 before_action :sign_up_params, only: :create
    3 before_action :account_update_params, only: :update
    4
    5 private
    6
    7 def sign_up_params
    8 params.require(:user).permit(:first_name, :last_name, :email, :password, :password_confirmation)
    9 end
    10
    11 def account_update_params
    12 params.require(:user).permit(:first_name, :last_name, :email, :password, :password_confirmation, :current_password)
    13 end
    • Van Hau Le @haulv commented Dec 10, 2019
      Master

      @nghiann chỗ này bị duplicate code hơi nhiều. Refactor lại cho gọn nhé!

      @nghiann chỗ này bị duplicate code hơi nhiều. Refactor lại cho gọn nhé!
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 10, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/10/diffs?diff_id=4442&start_sha=b29eef0919ede390492f10457f1f8e070b6cbd70#d55aad30052713a2e3ccd2f5ccd2c201047e9434_13_0)
      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 10, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 10, 2019
    app/controllers/users/registrations_controller.rb 0 → 100644
    1 class Users::RegistrationsController < Devise::RegistrationsController
    • Son Do Hong @sondh commented Dec 10, 2019
      Master

      controller này thằng Devise có sẵn r, em xóa đi vẫn oke nhé

      controller này thằng Devise có sẵn r, em xóa đi vẫn oke nhé
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 10, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/10/diffs?diff_id=4442&start_sha=b29eef0919ede390492f10457f1f8e070b6cbd70#d55aad30052713a2e3ccd2f5ccd2c201047e9434_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 10, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 3b8352e6 - edit routes/controllers

    Compare with previous version

    Dec 10, 2019

    added 1 commit

    • 3b8352e6 - edit routes/controllers

    Compare with previous version

    added 1 commit * 3b8352e6 - edit routes&#x2F;controllers [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/10/diffs?diff_id=4442&start_sha=b29eef0919ede390492f10457f1f8e070b6cbd70)
    Toggle commit list
  • Van Hau Le @haulv

    mentioned in commit 27e07bd1

    Dec 10, 2019

    mentioned in commit 27e07bd1

    mentioned in commit 27e07bd11f676c6884a0d833da71226e2cb9e336
    Toggle commit list
  • Van Hau Le @haulv

    merged

    Dec 10, 2019

    merged

    merged
    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
Nguyen Ngoc Nghia
Assignee
Nguyen Ngoc Nghia @nghiann
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: nghiann/VeNJOB!10
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.