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

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

Feature/top page - applying bootstrap

Edited Dec 03, 2019 by Nguyen Ngoc Nghia
×

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

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

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 7
  • Changes 21
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Ngoc Nghia @nghiann

    changed title from Feature/top page to Feature/top page - applying bootstrap

    Dec 03, 2019

    changed title from Feature/top page to Feature/top page - applying bootstrap

    changed title from **Feature/top page** to **Feature/top page{+ - applying bootstrap+}**
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • cf1069c9 - delete 2 files

    Compare with previous version

    Dec 03, 2019

    added 1 commit

    • cf1069c9 - delete 2 files

    Compare with previous version

    added 1 commit * cf1069c9 - delete 2 files [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/5/diffs?diff_id=4407&start_sha=c9abce7868a994e87266538809c9fb5e87edc993)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 03, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 03, 2019
    app/controllers/static_pages_controller.rb 0 → 100644
    1 class StaticPagesController < ApplicationController
    2 def top_page
    3 end
    4
    5 def favorite
    • Son Do Hong @sondh commented Dec 03, 2019
      Master

      bỏ action này với action history đi, em sẽ làm chúng nó ở controller khác

      bỏ action này với action history đi, em sẽ làm chúng nó ở controller khác
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 03, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/5/diffs?diff_id=4408&start_sha=cf1069c9a10b8b09eb7752467f003fe783daf5e6#e411ad7eefd53bf4aa08f4a552ee9cbdb8f5a0f2_5_2)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 03, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 03, 2019
    app/controllers/static_pages_controller.rb 0 → 100644
    1 class StaticPagesController < ApplicationController
    2 def top_page
    • Son Do Hong @sondh commented Dec 03, 2019
      Master

      cố gắng đặt tên action chuẩn, nằm trong 7 action restful

      cố gắng đặt tên action chuẩn, nằm trong 7 action restful
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 03, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/5/diffs?diff_id=4408&start_sha=cf1069c9a10b8b09eb7752467f003fe783daf5e6#e411ad7eefd53bf4aa08f4a552ee9cbdb8f5a0f2_2_2)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 03, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 03, 2019
    app/views/layouts/_header.html.erb 0 → 100644
    1 <header class="navbar navbar-fixed-top navbar-inverse navbar-dark bg-dark">
    2 <div class="container">
    3 <%= link_to image_tag("venjob_logo.png", alt: "VeNJOB Logo") , root_path, id: "logo" %>
    4 <nav>
    5 <ul class="nav navbar-nav navbar-right">
    6 <ul class="list">
    7 <li class="list-item">
    8 <li class="list-inline-item"><%= link_to "Login", "#" %></li>
    9 <li class="list-inline-item"><%= link_to "Register", "#" %></li>
    10 </li>
    11 <li class="list-item">
    12 <li class="list-inline-item"><%= link_to "Favorite", favorite_path %></li>
    13 <li class="list-inline-item"><%= link_to "History", history_path %></li>
    14 </li>
    15 </ul>
    16 <!-- <li><%= link_to "Login", "#" %></li>
    • Son Do Hong @sondh commented Dec 03, 2019
      Master

      ko dùng thì xóa code, tránh comment code

      ko dùng thì xóa code, tránh comment code
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 03, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/5/diffs?diff_id=4408&start_sha=cf1069c9a10b8b09eb7752467f003fe783daf5e6#12e0ffa73350b6f8b572afab727eeab71ee1df63_16_16)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong @sondh commented Dec 03, 2019
    Master

    @nghiann dùng file bootstrap.min thay cho file bootstrap

    @nghiann dùng file bootstrap.min thay cho file bootstrap
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 03, 2019

    resolved all discussions

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

    added 1 commit

    • 8e58beee - update

    Compare with previous version

    Dec 03, 2019

    added 1 commit

    • 8e58beee - update

    Compare with previous version

    added 1 commit * 8e58beee - update [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/5/diffs?diff_id=4408&start_sha=cf1069c9a10b8b09eb7752467f003fe783daf5e6)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • c6834db2 - change route

    Compare with previous version

    Dec 03, 2019

    added 1 commit

    • c6834db2 - change route

    Compare with previous version

    added 1 commit * c6834db2 - change route [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/5/diffs?diff_id=4409&start_sha=8e58beee809b568525f6eb01260d862144381883)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 639a75a6 - delete 2 routes

    Compare with previous version

    Dec 03, 2019

    added 1 commit

    • 639a75a6 - delete 2 routes

    Compare with previous version

    added 1 commit * 639a75a6 - delete 2 routes [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/5/diffs?diff_id=4410&start_sha=c6834db28db18e3a59ac4978f91f042981180929)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit f1acce90

    Dec 03, 2019

    mentioned in commit f1acce90

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

    merged

    Dec 03, 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
2
2 participants
Reference: nghiann/VeNJOB!5
×

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.