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

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

Feature/migration

×

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 9
  • Commits 3
  • Pipelines 3
  • Changes 24
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on the diff Nov 28, 2019
    Resolved by Son Do Hong Nov 28, 2019
    db/migrate/20191127073922_create_user_jobs.rb 0 → 100644
    1 class CreateUserJobs < ActiveRecord::Migration[6.0]
    2 def change
    3 create_table :user_jobs do |t|
    4 t.integer :user_id
    5 t.integer :job_id
    6 t.integer :job_type
    7 t.datetime :favorited_at
    8 t.datetime :viewed_at
    9 t.datetime :applied_at
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      thêm 1 space sau đây, bỏ 3 trường này đi

      t.datetime :favorited_at
      t.datetime :viewed_at
      t.datetime :applied_at
      thêm 1 space sau đây, bỏ 3 trường này đi ``` t.datetime :favorited_at t.datetime :viewed_at t.datetime :applied_at ```
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      Sửa lại DB luôn nhé

      Sửa lại DB luôn nhé
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 28, 2019
    Last updated by Đường Sỹ Hoàng Nov 28, 2019
    db/migrate/20191127073956_create_companies.rb 0 → 100644
    1 class CreateCompanies < ActiveRecord::Migration[6.0]
    2 def change
    3 create_table :companies do |t|
    4 t.string :username, null: false, default: ""
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      sao company lại có username được

      sao company lại có username được
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 28, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/1/diffs?diff_id=4402&start_sha=e207c8a13c18ba534b3f24a9300cb8e9a6083b93#d9eb91101474a254705cf4dfd7995a979986b182_4_4)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Nov 28, 2019
    db/migrate/20191127075223_create_industry_jobs.rb 0 → 100644
    1 class CreateIndustryJobs < ActiveRecord::Migration[6.0]
    2 def change
    3 create_table :industry_jobs do |t|
    4 t.integer :job_id
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      đánh index vào tất cả các khóa ngoại, các trường unique cũng đánh index luôn để tăng tốc độ truy xuất dữ liệu

      đánh index vào tất cả các khóa ngoại, các trường unique cũng đánh index luôn để tăng tốc độ truy xuất dữ liệu
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 28, 2019
    Last updated by Đường Sỹ Hoàng Nov 28, 2019
    app/models/user_job.rb 0 → 100644
    1 class UserJob < ApplicationRecord
    2 belongs_to :user
    3 belongs_to :jobs
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      sai quan hệ.

      Em viết như này thì sau này mình sẽ phải gọi là:

      UserJob.last.jobs à

      Edited Nov 28, 2019 by Son Do Hong
      sai quan hệ. Em viết như này thì sau này mình sẽ phải gọi là: `UserJob.last.jobs` à
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 28, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/1/diffs?diff_id=4402&start_sha=e207c8a13c18ba534b3f24a9300cb8e9a6083b93#88f54bc1d62c08b42d71d6c828fae646743ab295_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on the diff Nov 28, 2019
    app/models/user.rb 0 → 100644
    1 class User < ApplicationRecord
    2 # Include default devise modules. Others available are:
    3 # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4 devise :database_authenticatable, :registerable,
    5 :recoverable, :rememberable, :validatable
    6 has_many :user_jobs
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      add thêm dòng trống trước phần validation

      add thêm dòng trống trước phần validation
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 28, 2019
    Last updated by Đường Sỹ Hoàng Nov 28, 2019
    app/models/user.rb 0 → 100644
    1 class User < ApplicationRecord
    2 # Include default devise modules. Others available are:
    3 # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4 devise :database_authenticatable, :registerable,
    5 :recoverable, :rememberable, :validatable
    6 has_many :user_jobs
    7 validates :email, presence: true, uniqueness: true
    8 validates :username, presence: true, format: { with: /\A[A-Za-z][A-Za-z0-9._-]{2,19}\z/ }
    9 validates :first_name, presence: true, format: { with: /\A[A-Za-z][A-Za-z0-9._-]{2,19}\z/ }
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      format chấp nhận những cái tên như thế nào?

      format chấp nhận những cái tên như thế nào?
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 28, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/1/diffs?diff_id=4402&start_sha=e207c8a13c18ba534b3f24a9300cb8e9a6083b93#4ed0c03b53dbc8320da88e7887465514cd9e90a4_9_8)
      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 28, 2019
    Last updated by Đường Sỹ Hoàng Nov 28, 2019
    db/migrate/20191126074641_devise_create_users.rb 0 → 100644
    1 # frozen_string_literal: true
    2
    3 class DeviseCreateUsers < ActiveRecord::Migration[6.0]
    4 def change
    5 create_table :users do |t|
    6 ## Database authenticatable
    7 t.string :email, null: false, default: ""
    8 t.string :username, null:false, default: ""
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      add thêm uniq cho email, username

      add thêm uniq cho email, username
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 28, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/1/diffs?diff_id=4402&start_sha=e207c8a13c18ba534b3f24a9300cb8e9a6083b93#dcde9214cb6adc6a67871db27f710edcc47c9c30_8_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 28, 2019
    Last updated by Đường Sỹ Hoàng Nov 28, 2019
    test/fixtures/cities.yml 0 → 100644
    1 # Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
    2
    3 # This model initially had no columns defined. If you add columns to the
    4 # model remove the '{}' from the fixture names and add the columns immediately
    5 # below each fixture, per the syntax in the comments below
    • Son Do Hong @sondh commented Nov 28, 2019
      Master

      xóa các file test chưa dùng đến đi

      xóa các file test chưa dùng đến đi
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 2 of the diff

      Nov 28, 2019

      changed this line in version 2 of the diff

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

    added 1 commit

    • c4b3eb6e - Removed unuse files

    Compare with previous version

    Nov 28, 2019

    added 1 commit

    • c4b3eb6e - Removed unuse files

    Compare with previous version

    added 1 commit * c4b3eb6e - Removed unuse files [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/1/diffs?diff_id=4402&start_sha=e207c8a13c18ba534b3f24a9300cb8e9a6083b93)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit 159d97f4

    Nov 28, 2019

    mentioned in commit 159d97f4

    mentioned in commit 159d97f4531ef331c8dab91c065474283db508f4
    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
Son Do Hong
Assignee
Son Do Hong @sondh
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hoangds/VenJob!1
×

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.