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

Merged
Opened Nov 28, 2019 by Nguyen Ngoc Nghia@nghiann 
  • Report abuse
Report abuse

feature/migration (using devise)

×

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

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

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

    added 1 commit

    • 6abc22ae - edit table user_jobs

    Compare with previous version

    Nov 28, 2019

    added 1 commit

    • 6abc22ae - edit table user_jobs

    Compare with previous version

    added 1 commit * 6abc22ae - edit table user_jobs [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/2/diffs?diff_id=4395&start_sha=5a3760692f07ade6cf71861d6369eee4fd588259)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • ccdb86c4 - add unique

    Compare with previous version

    Nov 28, 2019

    added 1 commit

    • ccdb86c4 - add unique

    Compare with previous version

    added 1 commit * ccdb86c4 - add unique [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/2/diffs?diff_id=4397&start_sha=6abc22aed80f259f7771afc0a03b040bef6ae827)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 5bcdfe93 - add index

    Compare with previous version

    Nov 28, 2019

    added 1 commit

    • 5bcdfe93 - add index

    Compare with previous version

    added 1 commit * 5bcdfe93 - add index [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/2/diffs?diff_id=4398&start_sha=ccdb86c4f50072b0b0d28310cbdc09c19bbd5dae)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 28, 2019
    Last updated by Nguyen Ngoc Nghia Nov 28, 2019
    db/migrate/20191126082849_create_users.rb
    3 3 create_table :users do |t|
    4 4 t.string :first_name
    5 5 t.string :last_name
    6 t.string :email, unique: true
    7 t.string :username, unique: true
    8 t.integer :role
    9 t.string :password_digest
    10 t.string :reset_digest
    11 t.datetime :reset_sent_at
    6
    7 ## Database authenticatable
    8 t.string :email, null: false, default: ""
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      thêm unique vào chứ

      thêm unique vào chứ
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 6 of the diff

      Nov 28, 2019

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/2/diffs?diff_id=4400&start_sha=72b7d2390b58df2eb651774d6e7e10843262900c#fe0005b9b52864e6c71674fdeb75384d83e266cf_8_8)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Nov 28, 2019
    Resolved by Son Do Hong Nov 28, 2019
    db/migrate/20191126082849_create_users.rb
    3 3 create_table :users do |t|
    4 4 t.string :first_name
    5 5 t.string :last_name
    6 t.string :email, unique: true
    7 t.string :username, unique: true
    8 t.integer :role
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      trường nào cần thiết mà devise chưa có thì phải thêm vào

      trường nào cần thiết mà devise chưa có thì phải thêm vào
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Nov 28, 2019
    Resolved by Van Hau Le Nov 28, 2019
    db/migrate/20191126083151_create_user_jobs.rb
    4 4 t.references :user, null: false, foreign_key: true
    5 5 t.references :job, null: false, foreign_key: true
    6 6 t.datetime :applied_at
    7 t.integer :relation
    7 t.datetime :viewed_at
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      xem lại thiết kể bảng này

      xem lại thiết kể bảng này
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 72b7d239 - add index to tables

    Compare with previous version

    Nov 28, 2019

    added 1 commit

    • 72b7d239 - add index to tables

    Compare with previous version

    added 1 commit * 72b7d239 - add index to tables [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/2/diffs?diff_id=4399&start_sha=5bcdfe933ce28091a8662afd8e2ae875b3f261bd)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 5cf0f521 - add index to column email

    Compare with previous version

    Nov 28, 2019

    added 1 commit

    • 5cf0f521 - add index to column email

    Compare with previous version

    added 1 commit * 5cf0f521 - add index to column email [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/2/diffs?diff_id=4400&start_sha=72b7d2390b58df2eb651774d6e7e10843262900c)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 399d6ba9 - add space

    Compare with previous version

    Nov 28, 2019

    added 1 commit

    • 399d6ba9 - add space

    Compare with previous version

    added 1 commit * 399d6ba9 - add space [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/2/diffs?diff_id=4401&start_sha=5cf0f521df6824f245a8dd791f078385aa75602a)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit c993fe46

    Nov 28, 2019

    mentioned in commit c993fe46

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

    merged

    Nov 28, 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!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.