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
  • !11

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

Feature/password reset (local)

×

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/password_reset origin/feature/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 feature/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 7
  • Commits 9
  • Changes 10
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 24d336d5 - delete 2 files

    Compare with previous version

    Dec 10, 2019

    added 1 commit

    • 24d336d5 - delete 2 files

    Compare with previous version

    added 1 commit * 24d336d5 - delete 2 files [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/11/diffs?diff_id=4444&start_sha=5286137c8533c112ceff1f4a6f242423992f1139)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 0632d922 - edit text in reset mail

    Compare with previous version

    Dec 10, 2019

    added 1 commit

    • 0632d922 - edit text in reset mail

    Compare with previous version

    added 1 commit * 0632d922 - edit text in reset mail [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/11/diffs?diff_id=4445&start_sha=24d336d56a6cc2b3301697b91cf6048d6b5415a0)
    Toggle commit list
  • 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
    Gemfile
    42 42 gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
    43 43 gem 'pry'
    44 44 gem 'annotate'
    45 gem 'letter_opener'
    • Van Hau Le @haulv commented Dec 10, 2019
      Master

      @nghiann add gem này vào test development group để làm gì vậy em?

      @nghiann add gem này vào test development group để làm gì vậy em?
    • Nguyen Ngoc Nghia @nghiann commented Dec 10, 2019
      Master

      @haulv e config delivery_method của thằng smtp không thấy nó gửi nên em dùng cái này thì nó gửi được

      @haulv e config delivery_method của thằng smtp không thấy nó gửi nên em dùng cái này thì nó gửi được
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 4 of the diff

      Dec 10, 2019

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/11/diffs?diff_id=4447&start_sha=0632d9223ef11b7b684298bc79cbdb0f1eee1b51#de3150c01c3a946a6168173c4116741379fe3579_45_45)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on the diff Dec 10, 2019
    Resolved by Son Do Hong Dec 10, 2019
    app/views/users/mailer/email_changed.html.erb 0 → 100644
    1 <p>Hello <%= @email %>!</p>
    2
    3 <% if @resource.try(:unconfirmed_email?) %>
    • Van Hau Le @haulv commented Dec 10, 2019
      Master

      @nghiann implement thế này cho gọn nhé em!

      <% mail = @resource.try(:unconfirmed_email?) ? @resource.unconfirmed_email : @resource.emai %>
      <p>We're contacting you to notify you that your email is being changed to <%= mail %>.
      Edited Dec 10, 2019 by Van Hau Le
      @nghiann implement thế này cho gọn nhé em! ```ruby <% mail = @resource.try(:unconfirmed_email?) ? @resource.unconfirmed_email : @resource.emai %> <p>We're contacting you to notify you that your email is being changed to <%= mail %>. ```
    • Van Hau Le @haulv commented Dec 10, 2019
      Master

      @nghiann sorry em! 2 dòng message có chút khác nhau. nên keep như cũ nhé!

      @nghiann sorry em! 2 dòng message có chút khác nhau. nên keep như cũ nhé!
    • Nguyen Ngoc Nghia @nghiann commented Dec 10, 2019
      Master

      @haulv dạ

      @haulv dạ
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 7937af13 - delete unused gem

    Compare with previous version

    Dec 10, 2019

    added 1 commit

    • 7937af13 - delete unused gem

    Compare with previous version

    added 1 commit * 7937af13 - delete unused gem [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/11/diffs?diff_id=4447&start_sha=0632d9223ef11b7b684298bc79cbdb0f1eee1b51)
    Toggle commit list
  • Van Hau Le @haulv commented Dec 10, 2019
    Master

    @nghiann LGTM

    @nghiann LGTM
  • 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
    3 3 resources :industries, only: :index
    4 4 resources :cities, only: :index
    5 5 resources :jobs, only: :index
    6 devise_for :users
    6 devise_for :users, controllers: {
    7 # sessions: 'users/sessions'
    • Son Do Hong @sondh commented Dec 10, 2019
      Master

      đoạn này có cần k, nếu k cần thì xóa đi, để như cũ chứ

      đoạn này có cần k, nếu k cần thì xóa đi, để như cũ chứ
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 5 of the diff

      Dec 10, 2019

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/11/diffs?diff_id=4448&start_sha=7937af1304c8b002d4aedf80a477fca0a1e658a8#e801163eb9182955dca3eb9817d59af634f6665d_7_6)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • fc51c93d - edit routes.rb

    Compare with previous version

    Dec 10, 2019

    added 1 commit

    • fc51c93d - edit routes.rb

    Compare with previous version

    added 1 commit * fc51c93d - edit routes.rb [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/11/diffs?diff_id=4448&start_sha=7937af1304c8b002d4aedf80a477fca0a1e658a8)
    Toggle commit list
  • Son Do Hong @sondh

    resolved all discussions

    Dec 10, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit f853348f

    Dec 10, 2019

    mentioned in commit f853348f

    mentioned in commit f853348fba59d973385212cdb1561deff7f62499
    Toggle commit list
  • Son Do Hong @sondh

    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!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.