diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-07 22:34:57 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-07 22:46:30 +0300 |
| commit | 16cffa97f64f55a16a50cf861e133021f31c828f (patch) | |
| tree | 11ea0ed90591a07479045fd024ac60280813cc32 /app | |
| parent | 0640b3d1d89b7a4eda343eb23b0518a835ac9106 (diff) | |
Move locked_at removal to post-deployment migration
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index e0c779b4fbc..e83b11f7668 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -8,6 +8,7 @@ class MergeRequest < ActiveRecord::Base include CreatedAtFilterable ignore_column :position + ignore_column :locked_at belongs_to :target_project, class_name: "Project" belongs_to :source_project, class_name: "Project" |