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

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

Modeling users

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b modeling-users origin/modeling-users

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 modeling-users

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

    added 11 commits

    • 05a4e35e...cf5ee72e - 6 commits from branch master
    • 7b7baf3a - First commit
    • 06798760 - First commit
    • 1514d952 - Second commit
    • 2b492193 - Make a basic model (Including secure passwords)
    • 7684c992 - Fixed identation & double quote

    Compare with previous version

    Nov 12, 2019

    added 11 commits

    • 05a4e35e...cf5ee72e - 6 commits from branch master
    • 7b7baf3a - First commit
    • 06798760 - First commit
    • 1514d952 - Second commit
    • 2b492193 - Make a basic model (Including secure passwords)
    • 7684c992 - Fixed identation & double quote

    Compare with previous version

    added 11 commits * 05a4e35e...cf5ee72e - 6 commits from branch `master` * 7b7baf3a - First commit * 06798760 - First commit * 1514d952 - Second commit * 2b492193 - Make a basic model (Including secure passwords) * 7684c992 - Fixed identation & double quote [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/5/diffs?diff_id=4293&start_sha=05a4e35e40dc35207290fae0ba4392a7381cad43)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Nov 12, 2019
    Resolved by Đường Sỹ Hoàng Nov 12, 2019
    app/models/user.rb 0 → 100644
    1 class User < ApplicationRecord
    2 before_save { self.email = email.downcase }
    • Son Do Hong @sondh commented Nov 12, 2019
      Master

      sử dụng bang method email.downcase!

      sử dụng bang method `email.downcase!`
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 12, 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/5/diffs?diff_id=4295&start_sha=7684c992edd2ec16f8ecb0c810620a45e3bbc697#4ed0c03b53dbc8320da88e7887465514cd9e90a4_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 Nov 12, 2019
    Last updated by Đường Sỹ Hoàng Nov 12, 2019
    app/models/user.rb 0 → 100644
    1 class User < ApplicationRecord
    2 before_save { self.email = email.downcase }
    3 validates :name, presence: true, length: { maximum: 50 }
    4 VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
    5 validates :email, presence: true, length: { maximum: 255 },
    6 format: { with: VALID_EMAIL_REGEX },
    7 uniqueness: { case_sensitive: false }
    8 has_secure_password
    9 validates :password, presence: true, length: { minimum: 6 }
    • Son Do Hong @sondh commented Nov 12, 2019
      Master

      E đọc lại phần Rails style guide về Models: Active Record nhé. https://github.com/rubocop-hq/rails-style-guide#models-active-record Người ta có nói về thứ tự sắp xếp các methods đó. Trong sách ngta ko tuân thủ, nhưng trong dự án mình sẽ tuân thủ nha.

      E đọc lại phần Rails style guide về Models: Active Record nhé. https://github.com/rubocop-hq/rails-style-guide#models-active-record Người ta có nói về thứ tự sắp xếp các methods đó. Trong sách ngta ko tuân thủ, nhưng trong dự án mình sẽ tuân thủ nha.
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Nov 12, 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/5/diffs?diff_id=4295&start_sha=7684c992edd2ec16f8ecb0c810620a45e3bbc697#4ed0c03b53dbc8320da88e7887465514cd9e90a4_9_11)
      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 12, 2019
    Resolved by Đường Sỹ Hoàng Nov 12, 2019
    Gemfile
    1 1 source "https://rubygems.org"
    2 2
    3 3 gem "rails", "5.1.6"
    4 gem 'bcrypt', "3.1.12"
    • Son Do Hong @sondh commented Nov 12, 2019
      Master

      sử dụng "

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

      changed this line in version 3 of the diff

      Nov 12, 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/5/diffs?diff_id=4295&start_sha=7684c992edd2ec16f8ecb0c810620a45e3bbc697#de3150c01c3a946a6168173c4116741379fe3579_4_4)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 3 commits

    • 6d1f46eb - Fixed double quote
    • 6892b477 - Fixed double quote
    • bba05e1e - Fixed order & changed method bang

    Compare with previous version

    Nov 12, 2019

    added 3 commits

    • 6d1f46eb - Fixed double quote
    • 6892b477 - Fixed double quote
    • bba05e1e - Fixed order & changed method bang

    Compare with previous version

    added 3 commits * 6d1f46eb - Fixed double quote * 6892b477 - Fixed double quote * bba05e1e - Fixed order &amp; changed method bang [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/5/diffs?diff_id=4295&start_sha=7684c992edd2ec16f8ecb0c810620a45e3bbc697)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 0fcb54eb - Fixed identation self.email method

    Compare with previous version

    Nov 12, 2019

    added 1 commit

    • 0fcb54eb - Fixed identation self.email method

    Compare with previous version

    added 1 commit * 0fcb54eb - Fixed identation self.email method [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/5/diffs?diff_id=4296&start_sha=bba05e1ef29a24af2ff2925d78bcb26923f7d273)
    Toggle commit list
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 861227a7 - Fixed identation

    Compare with previous version

    Nov 12, 2019

    added 1 commit

    • 861227a7 - Fixed identation

    Compare with previous version

    added 1 commit * 861227a7 - Fixed identation [Compare with previous version](https://gitlab.zigexn.vn/hoangds/sample_app/merge_requests/5/diffs?diff_id=4297&start_sha=0fcb54eb65dc8fdfefe52dfab55e1ae14a8c032f)
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit dacd8477

    Nov 12, 2019

    mentioned in commit dacd8477

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

    merged

    Nov 12, 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
3
3 participants
Reference: hoangds/sample_app!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.