Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
I
InvestCustomer
  • 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
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Giang Tran
  • InvestCustomer
  • Merge Requests
  • !18

Merged
Opened Jun 10, 2021 by Nguyễn Thị Thúy@thuynt 
  • Report abuse
Report abuse

complete forgot and reactivation smart otp

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b forgot_smart_otp_pin origin/forgot_smart_otp_pin

Step 2. Review the changes locally

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

git checkout func_smart_otp
git merge --no-ff forgot_smart_otp_pin

Step 4. Push the result of the merge to GitLab

git push origin func_smart_otp

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

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

  • Discussion 0
  • Commits 3
  • Changes 8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyễn Thị Thúy @thuynt

    added 2 commits

    • 4c54b720 - 1 commit from branch func_smart_otp
    • 63a9432b - merge func_smart_otp

    Compare with previous version

    Jun 10, 2021

    added 2 commits

    • 4c54b720 - 1 commit from branch func_smart_otp
    • 63a9432b - merge func_smart_otp

    Compare with previous version

    added 2 commits <ul><li>4c54b720 - 1 commit from branch <code>func_smart_otp</code></li><li>63a9432b - merge func_smart_otp</li></ul> [Compare with previous version](http://git.dcv.vn/tdgiangdev/InvestCustomer/merge_requests/18/diffs?diff_id=1182&start_sha=260871dcb8e5dfb5fcb54c3749ae9317a774dcf7)
    Toggle commit list
  • Nguyễn Thị Thúy @thuynt

    added 3 commits

    • 63a9432b...6be9c092 - 2 commits from branch func_smart_otp
    • 7a38dcbf - merge func_smart_otp

    Compare with previous version

    Jun 10, 2021

    added 3 commits

    • 63a9432b...6be9c092 - 2 commits from branch func_smart_otp
    • 7a38dcbf - merge func_smart_otp

    Compare with previous version

    added 3 commits <ul><li>63a9432b...6be9c092 - 2 commits from branch <code>func_smart_otp</code></li><li>7a38dcbf - merge func_smart_otp</li></ul> [Compare with previous version](http://git.dcv.vn/tdgiangdev/InvestCustomer/merge_requests/18/diffs?diff_id=1183&start_sha=63a9432b3d92e89fd7aeeeba9abf751726b2334e)
    Toggle commit list
  • Nguyễn Thị Thúy @thuynt

    mentioned in commit 54fd1efd

    Jun 10, 2021

    mentioned in commit 54fd1efd

    mentioned in commit 54fd1efd3b183d31ed5a81386d8e68e7de09bf88
    Toggle commit list
  • Nguyễn Thị Thúy @thuynt

    merged

    Jun 10, 2021

    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
0
Labels
None
Assign labels
  • View project labels
Reference: tdgiangdev/InvestCustomer!18
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.