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

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

Rails flavored ruby

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b rails-flavored-ruby origin/rails-flavored-ruby

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 rails-flavored-ruby

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 8
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 07, 2019
    Resolved by Đường Sỹ Hoàng Nov 07, 2019
    app/controllers/static_pages_controller.rb
    10 10
    11 11 def contact
    12 12 end
    13
    14 def helper
    • Son Do Hong @sondh commented Nov 07, 2019
      Master

      phần này là gì đây

      phần này là gì đây
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 07, 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/3/diffs?diff_id=4271&start_sha=18852201a9a90e9a2ccee4dcb972a3ae77c51684#e411ad7eefd53bf4aa08f4a552ee9cbdb8f5a0f2_14_13)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 18852201 - replaced title tag

    Compare with previous version

    Nov 07, 2019

    added 1 commit

    • 18852201 - replaced title tag

    Compare with previous version

    added 1 commit * 18852201 - replaced title tag [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/3/diffs?diff_id=4270&start_sha=75e8a6eae4496f56ed207b8deeb9225e5964cd6e)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 2d820d3c - Removed method helper

    Compare with previous version

    Nov 07, 2019

    added 1 commit

    • 2d820d3c - Removed method helper

    Compare with previous version

    added 1 commit * 2d820d3c - Removed method helper [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/3/diffs?diff_id=4271&start_sha=18852201a9a90e9a2ccee4dcb972a3ae77c51684)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 14d98fe7 - Removed Home title

    Compare with previous version

    Nov 07, 2019

    added 1 commit

    • 14d98fe7 - Removed Home title

    Compare with previous version

    added 1 commit * 14d98fe7 - Removed Home title [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/3/diffs?diff_id=4273&start_sha=2d820d3c5e38691beb6d5019a3e2eec64a6fab27)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    resolved all discussions

    Nov 07, 2019

    resolved all discussions

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

    added 2 commits

    • 8a4c936f - Removed new line
    • 77212928 - Replaceddoulbe quote

    Compare with previous version

    Nov 07, 2019

    added 2 commits

    • 8a4c936f - Removed new line
    • 77212928 - Replaceddoulbe quote

    Compare with previous version

    added 2 commits * 8a4c936f - Removed new line * 77212928 - Replaceddoulbe quote [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/3/diffs?diff_id=4274&start_sha=14d98fe74cc76a4041d1bcab5b4c53104256a08d)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit 9472d3c8

    Nov 07, 2019

    mentioned in commit 9472d3c8

    mentioned in commit 9472d3c88ce0150d5fa0e8e81ba2582b6249394d
    Toggle commit list
  • Son Do Hong @sondh

    merged

    Nov 07, 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
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hoangds/sample_app!3
×

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.