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
  • Đường Sỹ Hoàng
  • sample_app
  • Merge Requests
  • !4

Merged
Opened Nov 07, 2019 by Đường Sỹ Hoàng@hoangds 
  • Report abuse
Report abuse

Filling in layout

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b filling-in-layout origin/filling-in-layout

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 filling-in-layout

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 5
  • Changes 19
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 08, 2019
    Resolved by Đường Sỹ Hoàng Nov 08, 2019
    test/controllers/static_pages_controller_test.rb
    15 15 end
    16 16
    17 17 test "should get about" do
    18 get static_pages_about_url
    18 get about_path
    19 19 assert_response :success
    20 20 assert_select "title", "About | Ruby on Rails Tutorial Sample App"
    21 21 end
    22
    23 test "should get contact" do
    24 get contact_path
    25 assert_response :success
    26 assert_select "title", "Contact | Ruby on Rails Tutorial Sample App"
    27 end
    28
    29 test "should get signup" do
    • Son Do Hong @sondh commented Nov 08, 2019
      Master

      indent

      indent
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 08, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/4/diffs?diff_id=4279&start_sha=88fc01189c2e1df949e6cc3a7dd8881474c635f8#1d9ba264cd09ea2b73fa1a5980c69839a1613d55_29_22)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 88fc0118 - Fixed Identication

    Compare with previous version

    Nov 08, 2019

    added 1 commit

    • 88fc0118 - Fixed Identication

    Compare with previous version

    added 1 commit * 88fc0118 - Fixed Identication [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/4/diffs?diff_id=4277&start_sha=0ba99f53c22718769170ba6d481f7fe4c7beefa8)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    resolved all discussions

    Nov 08, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 196dcd1b - Fixed indentation

    Compare with previous version

    Nov 08, 2019

    added 1 commit

    • 196dcd1b - Fixed indentation

    Compare with previous version

    added 1 commit * 196dcd1b - Fixed indentation [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/4/diffs?diff_id=4279&start_sha=88fc01189c2e1df949e6cc3a7dd8881474c635f8)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit cf5ee72e

    Nov 08, 2019

    mentioned in commit cf5ee72e

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

    merged

    Nov 08, 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
Son Do Hong
Assignee
Son Do Hong @sondh
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hoangds/sample_app!4
×

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.