diff options
| author | micael.bergeron <micaelbergeron@gmail.com> | 2017-11-06 17:03:11 +0300 |
|---|---|---|
| committer | micael.bergeron <micaelbergeron@gmail.com> | 2017-11-06 17:03:11 +0300 |
| commit | bb0543ef4782febe4dd0f26fc8a476b743fb86ca (patch) | |
| tree | 9320fd05f6c1eb2f57cdd6fc65493a9366dce17d /app | |
| parent | 6c1c64d4bb36099fa4876db309b5f8873650e909 (diff) | |
ignore the column before the migration
reword the changelog
remove dead code in the specs
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ccad8e102aa..f80601f3484 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -8,7 +8,8 @@ class MergeRequest < ActiveRecord::Base include CreatedAtFilterable include TimeTrackable - ignore_column :locked_at + ignore_column :locked_at, + :ref_fetched belongs_to :target_project, class_name: "Project" belongs_to :source_project, class_name: "Project" |