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

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

Feature/basic login & logout

×

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

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

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 3
  • Commits 2
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 06, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 09, 2019
    app/views/users/shared/_links.html.erb
    1 1 <%- if controller_name != 'sessions' %>
    2 <%= link_to "Log in", new_session_path(resource_name) %><br />
    2 <%= link_to "Login", new_session_path(resource_name) %><br />
    • Son Do Hong @sondh commented Dec 06, 2019
      Master

      log in là 2 chữ nhé :v

      log in là 2 chữ nhé :v
    • Nguyen Ngoc Nghia @nghiann commented Dec 09, 2019
      Master

      Ok a :v

      Ok a :v
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 09, 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/9/diffs?diff_id=4440&start_sha=1bc1aba85199616115c88682db8a922009ace128#4408285f4c22f0cb9917be56135d55a418558378_2_2)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 09, 2019

    resolved all discussions

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

    added 1 commit

    • 28e15c0a - edit "log in"

    Compare with previous version

    Dec 09, 2019

    added 1 commit

    • 28e15c0a - edit "log in"

    Compare with previous version

    added 1 commit * 28e15c0a - edit &quot;log in&quot; [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/9/diffs?diff_id=4440&start_sha=1bc1aba85199616115c88682db8a922009ace128)
    Toggle commit list
  • Van Hau Le @haulv commented Dec 09, 2019
    Master

    @nghiann LGTM

    @nghiann LGTM
  • Van Hau Le @haulv

    mentioned in commit a025896c

    Dec 09, 2019

    mentioned in commit a025896c

    mentioned in commit a025896cc9383d4d94165d1930ede0cf5aaf356f
    Toggle commit list
  • Van Hau Le @haulv

    merged

    Dec 09, 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!9
×

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.