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 1
    • Merge Requests 1
  • 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
  • VenJob
  • Merge Requests
  • !11

Merged
Opened Jan 15, 2020 by Đường Sỹ Hoàng@hoangds 
  • Report abuse
Report abuse

Feature/job apply

×

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

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

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 3
  • Commits 8
  • Changes 23
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • a0a457d1 - Fix bug model User, create Apply, apply process

    Compare with previous version

    Jan 15, 2020

    added 1 commit

    • a0a457d1 - Fix bug model User, create Apply, apply process

    Compare with previous version

    added 1 commit * a0a457d1 - Fix bug model User, create Apply, apply process [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4666&start_sha=3f686eeee741797d9102036bceb233e37619dbae)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 0a22afec - Add params to url

    Compare with previous version

    Jan 15, 2020

    added 1 commit

    • 0a22afec - Add params to url

    Compare with previous version

    added 1 commit * 0a22afec - Add params to url [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4667&start_sha=a0a457d1d98aa0c8c2fd6a7e886a94640c2e601a)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • d70e6157 - Remove mailer files

    Compare with previous version

    Jan 15, 2020

    added 1 commit

    • d70e6157 - Remove mailer files

    Compare with previous version

    added 1 commit * d70e6157 - Remove mailer files [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4668&start_sha=0a22afecf295c6577ece1051793a67642127a320)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 15, 2020
    Last updated by Đường Sỹ Hoàng Jan 15, 2020
    app/models/job.rb
    4 4 has_many :industry_jobs
    5 5 has_many :cities, through: :city_jobs
    6 6 has_many :industries, through: :industry_jobs
    7 has_many :apply_jobs
    • Son Do Hong @sondh commented Jan 15, 2020
      Master

      has_many :applies

      `has_many :applies`
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 5 of the diff

      Jan 15, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4669&start_sha=d70e615756503166efd744ece65b534783c21c37#742abd5cbc2b12d2da315862ace6297c7d6dcb87_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 Jan 15, 2020
    Last updated by Đường Sỹ Hoàng Jan 15, 2020
    app/views/apply/confirm.html.erb 0 → 100644
    2 <nav aria-label="breadcrumb">
    3 <ol class="breadcrumb">
    4 <li class="breadcrumb-item">
    5 <%= link_to "Apply New", apply_path %>
    6 </li>
    7 <li class="breadcrumb-item active" aria-current="page">
    8 Apply Confirm
    9 </li>
    10 <li class="breadcrumb-item">
    11 <%= link_to "Apply Finish", "#" %>
    12 </li>
    13 </ol>
    14
    15 <div class="container">
    16 <div class="d-flex justify-content-center ">
    17 <div class="card">
    • Son Do Hong @sondh commented Jan 15, 2020
      Master

      dòng này chưa sửa af?

      dòng này chưa sửa af?
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 5 of the diff

      Jan 15, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4669&start_sha=d70e615756503166efd744ece65b534783c21c37#3fd37acaf9465bfa7fead9114fbe8ecb2a70d0dd_17_17)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 15, 2020
    Last updated by Đường Sỹ Hoàng Jan 15, 2020
    app/views/apply/done.html.erb 0 → 100644
    1 <!--links menu-->
    2 <nav aria-label="breadcrumb">
    3 <ol class="breadcrumb">
    4 <li class = "breadcrumb-item">
    5 <%= link_to "Apply New" %>
    • Son Do Hong @sondh commented Jan 15, 2020
      Master

      sửa lại breadcrum, không cần link to, chỉ cần hiển thị text. Tách ra thành 1 file _apply_breadcrumb.html.erb, render ở 3 trang, apply, confirm, new

      sửa lại breadcrum, không cần link to, chỉ cần hiển thị text. Tách ra thành 1 file `_apply_breadcrumb.html.erb`, render ở 3 trang, apply, confirm, new
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 6 of the diff

      Jan 15, 2020

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4670&start_sha=bf0013a2138be6112f077a37d23569f76475bdfe#2285b344badaea60606f343aead25b9047ee38ce_5_1)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 2 commits

    • b0f70dc4 - Fix indent in views
    • bf0013a2 - Fix Job model

    Compare with previous version

    Jan 15, 2020

    added 2 commits

    • b0f70dc4 - Fix indent in views
    • bf0013a2 - Fix Job model

    Compare with previous version

    added 2 commits * b0f70dc4 - Fix indent in views * bf0013a2 - Fix Job model [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4669&start_sha=d70e615756503166efd744ece65b534783c21c37)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • c492ff7d - Render breadcrum partial,fix form template

    Compare with previous version

    Jan 15, 2020

    added 1 commit

    • c492ff7d - Render breadcrum partial,fix form template

    Compare with previous version

    added 1 commit * c492ff7d - Render breadcrum partial,fix form template [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/11/diffs?diff_id=4670&start_sha=bf0013a2138be6112f077a37d23569f76475bdfe)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit eb96d09b

    Jan 15, 2020

    mentioned in commit eb96d09b

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

    merged

    Jan 15, 2020

    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/VenJob!11
×

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.