Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
ThaiMinhPhuc_training
  • 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
  • phuctmZigexn
  • ThaiMinhPhuc_training
  • Merge Requests
  • !14

Merged
Opened Aug 14, 2018 by phuctmZigexn@phuctm 
  • Report abuse
Report abuse

Add password reset

×

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 1
  • Commits 4
  • Changes 21
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • phuctmZigexn @phuctm

    added 1 commit

    • ad672638 - Delete password_resets.js

    Compare with previous version

    Aug 14, 2018

    added 1 commit

    • ad672638 - Delete password_resets.js

    Compare with previous version

    added 1 commit * ad672638 - Delete password_resets.js [Compare with previous version](https://gitlab.zigexn.vn/phuctm/ThaiMinhPhuc_training/merge_requests/14/diffs?diff_id=3963&start_sha=a0954f3a5abd831068815876860d5a805239326b)
    Toggle commit list
  • phuctmZigexn @phuctm

    added 1 commit

    • 7788134c - Delete password_resets.scss

    Compare with previous version

    Aug 14, 2018

    added 1 commit

    • 7788134c - Delete password_resets.scss

    Compare with previous version

    added 1 commit * 7788134c - Delete password_resets.scss [Compare with previous version](https://gitlab.zigexn.vn/phuctm/ThaiMinhPhuc_training/merge_requests/14/diffs?diff_id=3964&start_sha=ad6726387c9607faefb1ab3ada5f08639f21e0d3)
    Toggle commit list
  • phuctmZigexn @phuctm

    added 1 commit

    • 5871244e - Delete password_resets_helper.rb

    Compare with previous version

    Aug 14, 2018

    added 1 commit

    • 5871244e - Delete password_resets_helper.rb

    Compare with previous version

    added 1 commit * 5871244e - Delete password_resets_helper.rb [Compare with previous version](https://gitlab.zigexn.vn/phuctm/ThaiMinhPhuc_training/merge_requests/14/diffs?diff_id=3965&start_sha=7788134c5c41d4f63d63a867e6487574f70427fb)
    Toggle commit list
  • Ba Toi Dang
    @toidb started a discussion on the diff Aug 14, 2018
    config/application.rb
    1 1 require_relative 'boot'
    2 2
    3 require 'rails/all'
    3 require 'rails'
    4
    5 # Include each railties manually, excluding `active_storage/engine`
    6 require "active_model/railtie"
    7 require "active_job/railtie"
    8 require "active_record/railtie"
    9 # require "active_storage/engine"
    10 require "action_controller/railtie"
    11 require "action_mailer/railtie"
    12 require "action_view/railtie"
    13 require "action_cable/engine"
    • Ba Toi Dang @toidb commented Aug 14, 2018
      Master

      @phuctm remove unused code.

      @phuctm remove unused code.
    Please register or sign in to reply
  • Ba Toi Dang @toidb

    merged

    Aug 15, 2018

    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
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: phuctm/ThaiMinhPhuc_training!14