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

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

Static pages

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b static-pages origin/static-pages

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 static-pages

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 6
  • Commits 5
  • Changes 9
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 06, 2019
    Last updated by Đường Sỹ Hoàng Nov 06, 2019
    app/assets/javascripts/static_pages.coffee 0 → 100644
    1 # Place all the behaviors and hooks related to the matching controller here.
    • Son Do Hong @sondh commented Nov 06, 2019
      Master

      không dùng thì xóa file này đi

      không dùng thì xóa file này đi
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 06, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/2/diffs?diff_id=4267&start_sha=8002091ab54f312e03c4b8856e98f3fb7ad01605#ef08fbb2d7d37229365ab8a0f9105b52975ec15e_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 06, 2019
    Last updated by Đường Sỹ Hoàng Nov 06, 2019
    app/assets/stylesheets/static_pages.scss 0 → 100644
    1 // Place all the styles related to the StaticPages controller here.
    • Son Do Hong @sondh commented Nov 06, 2019
      Master

      không dùng thì xóa file này đi

      không dùng thì xóa file này đi
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 06, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/2/diffs?diff_id=4267&start_sha=8002091ab54f312e03c4b8856e98f3fb7ad01605#a50608b2d20fae6205389ce1a2458189afc33b63_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 06, 2019
    Last updated by Đường Sỹ Hoàng Nov 06, 2019
    app/controllers/static_pages_controller.rb 0 → 100644
    1 class StaticPagesController < ApplicationController
    2 def home
    3 end
    4
    5 def help
    6 end
    7
    8 def about
    9 end
    10
    11 def contact
    12 end
    13
    • Son Do Hong @sondh commented Nov 06, 2019
      Master

      xóa dòng trống ở đây

      xóa dòng trống ở đây
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 06, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/2/diffs?diff_id=4267&start_sha=8002091ab54f312e03c4b8856e98f3fb7ad01605#e411ad7eefd53bf4aa08f4a552ee9cbdb8f5a0f2_13_13)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 06, 2019
    Last updated by Đường Sỹ Hoàng Nov 06, 2019
    config/routes.rb
    1 1 Rails.application.routes.draw do
    2 get 'static_pages/home'
    3 get 'static_pages/help'
    4 get 'static_pages/about'
    5 get 'static_pages/contact'
    2 6 # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
    3 7
    4 root 'application#hello'
    8 root 'static_pages#home'
    • Son Do Hong @sondh commented Nov 06, 2019
      Master

      indentation, căn thẳng hàng với các dòng trên

      indentation, căn thẳng hàng với các dòng trên
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 06, 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/2/diffs?diff_id=4268&start_sha=a24b0a585b3c00e375e91bdc981f52eafa3d2a1e#e801163eb9182955dca3eb9817d59af634f6665d_7_7)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 06, 2019
    Last updated by Đường Sỹ Hoàng Nov 06, 2019
    test/controllers/static_pages_controller_test.rb 0 → 100644
    1 require 'test_helper'
    • Son Do Hong @sondh commented Nov 06, 2019
      Master

      sử dụng thống nhất "

      sử dụng thống nhất `"`
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 06, 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/2/diffs?diff_id=4268&start_sha=a24b0a585b3c00e375e91bdc981f52eafa3d2a1e#1d9ba264cd09ea2b73fa1a5980c69839a1613d55_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 06, 2019
    Last updated by Đường Sỹ Hoàng Nov 06, 2019
    config/routes.rb
    1 1 Rails.application.routes.draw do
    2 get 'static_pages/home'
    • Son Do Hong @sondh commented Nov 06, 2019
      Master

      sử dụng double quote "

      sử dụng double quote `"`
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 06, 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/2/diffs?diff_id=4268&start_sha=a24b0a585b3c00e375e91bdc981f52eafa3d2a1e#e801163eb9182955dca3eb9817d59af634f6665d_2_2)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • a24b0a58 - static pages fix

    Compare with previous version

    Nov 06, 2019

    added 1 commit

    • a24b0a58 - static pages fix

    Compare with previous version

    added 1 commit * a24b0a58 - static pages fix [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/2/diffs?diff_id=4267&start_sha=8002091ab54f312e03c4b8856e98f3fb7ad01605)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 345afc5f - Update double quote and Identication

    Compare with previous version

    Nov 06, 2019

    added 1 commit

    • 345afc5f - Update double quote and Identication

    Compare with previous version

    added 1 commit * 345afc5f - Update double quote and Identication [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/2/diffs?diff_id=4268&start_sha=a24b0a585b3c00e375e91bdc981f52eafa3d2a1e)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    mentioned in commit d5001f87

    Nov 06, 2019

    mentioned in commit d5001f87

    mentioned in commit d5001f87fce1d256fd844149ca950d89e1156b03
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    merged

    Nov 06, 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!2
×

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.