diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-02 11:03:10 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-02 11:03:10 +0300 |
| commit | da50984bdee0a69364bcb354a7f7c461bf31bf3d (patch) | |
| tree | 3449c6820e66b3e09200eee4a41965b1c9933a1a /app/models/commit.rb | |
| parent | 415bf587f26ed4c3e18e48d643bf741414cdcdb7 (diff) | |
| parent | 68c75bc0f9f279602c5269569fb892b4ed243403 (diff) | |
Merge branch 'blackst0ne-rails5-add-touch-later-to-commit-model' into 'master'
[Rails5] Add `touch_later` to `Commit` model
See merge request gitlab-org/gitlab-ce!18642
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 32f3d90595a..b46f9f34689 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -424,6 +424,12 @@ class Commit # no-op but needs to be defined since #persisted? is defined end + def touch_later + # No-op. + # This method is called by ActiveRecord. + # We don't want to do anything for `Commit` model, so this is empty. + end + WIP_REGEX = /\A\s*(((?i)(\[WIP\]|WIP:|WIP)\s|WIP$))|(fixup!|squash!)\s/.freeze def work_in_progress? |