Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
S
sample_app
  • 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
  • Đường Sỹ Hoàng
  • sample_app
  • Merge Requests
  • !11

Merged
Opened Nov 20, 2019 by Đường Sỹ Hoàng@hoangds 
  • Report abuse
Report abuse

First commit

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b password-reset origin/password-reset

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 password-reset

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 2
  • Commits 6
  • Changes 16
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 8d369102 - Fixed double quote

    Compare with previous version

    Nov 20, 2019

    added 1 commit

    • 8d369102 - Fixed double quote

    Compare with previous version

    added 1 commit * 8d369102 - Fixed double quote [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4362&start_sha=c38e28d426e3521ee2eb3658ef4acdc47c4c7352)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 20, 2019
    Last updated by Đường Sỹ Hoàng Nov 20, 2019
    app/controllers/password_resets_controller.rb 0 → 100644
    23 if params[:user][:password].empty? # Case (3)
    24 @user.errors.add(:password, "can't be empty")
    25 render "edit"
    26 elsif @user.update_attributes(user_params) # Case (4)
    27 log_in @user
    28 @user.update_attribute(:reset_digest, nil)
    29 flash[:success] = "Password has been reset."
    30 redirect_to @user
    31 else
    32 render "edit" # Case (2)
    33 end
    34 end
    35
    36 private
    37
    38 def user_params
    • Son Do Hong @sondh commented Nov 20, 2019
      Master

      indent, thẳng với private

      indent, thẳng với private
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 20, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4363&start_sha=8d36910233b9b13f72980043c4a588fa56a20b31#f6daeca7322bed5d7805a4a5ef314100f88fb69b_38_38)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 7ce6c8e3 - Fixed identation

    Compare with previous version

    Nov 20, 2019

    added 1 commit

    • 7ce6c8e3 - Fixed identation

    Compare with previous version

    added 1 commit * 7ce6c8e3 - Fixed identation [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4363&start_sha=8d36910233b9b13f72980043c4a588fa56a20b31)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 084d9250 - Removed unuse files

    Compare with previous version

    Nov 20, 2019

    added 1 commit

    • 084d9250 - Removed unuse files

    Compare with previous version

    added 1 commit * 084d9250 - Removed unuse files [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4364&start_sha=7ce6c8e31f4420f22b2e92740c150aed5e6298f8)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 20, 2019
    Last updated by Đường Sỹ Hoàng Nov 20, 2019
    app/controllers/password_resets_controller.rb 0 → 100644
    34 end
    35
    36 private
    37
    38 def user_params
    39 params.require(:user).permit(:password, :password_confirmation)
    40 end
    41
    42 def get_user
    43 @user = User.find_by(email: params[:email])
    44 end
    45
    46 # Confirms a valid user.
    47 def valid_user
    48 unless (@user && @user.activated? && @user.authenticated?(:reset, params[:id]))
    49 redirect_to root_url
    • Son Do Hong @sondh commented Nov 20, 2019
      Master

      chỗ này có thể viết gọn lại thành 1 dòng

      chỗ này có thể viết gọn lại thành 1 dòng
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 7 of the diff

      Nov 20, 2019

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4368&start_sha=56bf99a9772ebd6b34719d6da7ba9c1045e9fc43#f6daeca7322bed5d7805a4a5ef314100f88fb69b_49_48)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 56bf99a9 - Removed unuse files

    Compare with previous version

    Nov 20, 2019

    added 1 commit

    • 56bf99a9 - Removed unuse files

    Compare with previous version

    added 1 commit * 56bf99a9 - Removed unuse files [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4366&start_sha=7ce6c8e31f4420f22b2e92740c150aed5e6298f8)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • f16c7517 - Combine unless operator

    Compare with previous version

    Nov 20, 2019

    added 1 commit

    • f16c7517 - Combine unless operator

    Compare with previous version

    added 1 commit * f16c7517 - Combine unless operator [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4368&start_sha=56bf99a9772ebd6b34719d6da7ba9c1045e9fc43)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 449dd2b7 - Fix identation

    Compare with previous version

    Nov 20, 2019

    added 1 commit

    • 449dd2b7 - Fix identation

    Compare with previous version

    added 1 commit * 449dd2b7 - Fix identation [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/11/diffs?diff_id=4369&start_sha=f16c7517239050913a309095c6af98510c01f1c8)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit 6c0ca261

    Nov 20, 2019

    mentioned in commit 6c0ca261

    mentioned in commit 6c0ca261fde202e9c88e1cc9b2c1647c347fd2af
    Toggle commit list
  • Son Do Hong @sondh

    merged

    Nov 20, 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
Son Do Hong
Assignee
Son Do Hong @sondh
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hoangds/sample_app!11
×

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.