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
  • Nguyen Hoang Mai Phuong
  • sample_app
  • Merge Requests
  • !10

Merged
Opened Jun 16, 2021 by Nguyen Hoang Mai Phuong@phuongnhm 
  • Report abuse
Report abuse

basic login

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b basic-login origin/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 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 4
  • Commits 3
  • Pipelines 3
  • Changes 21
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 57fb8aec - Implement basic login

    Compare with previous version

    Jun 16, 2021

    added 1 commit

    • 57fb8aec - Implement basic login

    Compare with previous version

    added 1 commit * 57fb8aec - Implement basic login [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/sample_app/merge_requests/10/diffs?diff_id=5276&start_sha=b1a0794b17699728ba19ce2137df56bab89b25a6)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jun 16, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 17, 2021
    app/assets/stylesheets/custom.scss
    47 47 }
    48 48 }
    49 49
    50 .navbar li a{
    50 .navbar ul{
    • Thanh Hung Pham @hungpt commented Jun 16, 2021
      Master

      @phuongnhm add space before {. Tương tự css chỗ khác.

      @phuongnhm add space before `{`. Tương tự css chỗ khác.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jun 17, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/sample_app/merge_requests/10/diffs?diff_id=5277&start_sha=57fb8aec0c20b16950077c447e646e432ab8fab4#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_50_50)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jun 16, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 17, 2021
    app/assets/stylesheets/custom.scss
    47 47 }
    48 48 }
    49 49
    50 .navbar li a{
    50 .navbar ul{
    51 list-style: none;
    52 }
    53 li a{
    • Thanh Hung Pham @hungpt commented Jun 16, 2021
      Master

      @phuongnhm add 1 line giữa các block define css nha em. Tương tự mấy chỗ khác

      @phuongnhm add `1 line` giữa các block define css nha em. Tương tự mấy chỗ khác
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jun 17, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/sample_app/merge_requests/10/diffs?diff_id=5277&start_sha=57fb8aec0c20b16950077c447e646e432ab8fab4#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_53_53)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jun 16, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 17, 2021
    app/controllers/sessions_controller.rb 0 → 100644
    1 class SessionsController < ApplicationController
    2 include SessionsHelper
    3 def new
    • Thanh Hung Pham @hungpt commented Jun 16, 2021
      Master

      @phuongnhm add 1 line before method nha em

      @phuongnhm add `1 line` before method nha em
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jun 16, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 17, 2021
    test/integration/users_login_test.rb 0 → 100644
    1 require "test_helper"
    2
    3 class UsersLoginTest < ActionDispatch::IntegrationTest
    4 def setup
    5 @user = users(:michael)
    6 end
    7
    8 test "login with valid email/invalid password" do
    9 get login_path
    • Thanh Hung Pham @hungpt commented Jun 16, 2021
      Master

      @phuongnhm chỗ này dư space từ L9 - L18 nè em.

      @phuongnhm chỗ này dư space từ L9 - L18 nè em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jun 17, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/sample_app/merge_requests/10/diffs?diff_id=5277&start_sha=57fb8aec0c20b16950077c447e646e432ab8fab4#01f0e4b53eea44838db1b1e9690b6e9dd29b61ec_9_9)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    resolved all discussions

    Jun 17, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • f9e786b7 - fix style code

    Compare with previous version

    Jun 17, 2021

    added 1 commit

    • f9e786b7 - fix style code

    Compare with previous version

    added 1 commit * f9e786b7 - fix style code [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/sample_app/merge_requests/10/diffs?diff_id=5277&start_sha=57fb8aec0c20b16950077c447e646e432ab8fab4)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    mentioned in commit d7709f9a

    Jun 17, 2021

    mentioned in commit d7709f9a

    mentioned in commit d7709f9aa05da07d6280408780cf129e44f4501a
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    merged

    Jun 17, 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
2
2 participants
Reference: phuongnhm/sample_app!10
×

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.