diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-01 13:06:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-01 13:06:30 +0000 |
| commit | 483d88a9cdc8dc8f699b962c206eaa007aa370ef (patch) | |
| tree | fed5d381bce05e823eb45d7d499c592122f39581 /app/models/merge_request.rb | |
| parent | c72abcefe79dd906cbbf0088b442a8979e9fc746 (diff) | |
| parent | cd74c1434e42f7e6aa12fe2e2b8d9b1e56aea78f (diff) | |
| download | gitlab-ce-483d88a9cdc8dc8f699b962c206eaa007aa370ef.tar.gz | |
Merge branch 'document-not-using-serialize' into 'master'
Document not using ActiveRecord's serialize method
See merge request !11821
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 56fec3ca39c..4bccda8a732 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -21,7 +21,7 @@ class MergeRequest < ActiveRecord::Base belongs_to :assignee, class_name: "User" - serialize :merge_params, Hash + serialize :merge_params, Hash # rubocop:disable Cop/ActiverecordSerialize after_create :ensure_merge_request_diff, unless: :importing? after_update :reload_diff_if_branch_changed |