diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-19 15:46:04 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-19 15:46:04 +0100 |
| commit | f5a630111fb1499a1541e77040529f74ca6475ec (patch) | |
| tree | c3c82cd23d7bdcbfe4ec38d12be4572a6e8653ee /app/models/merge_request.rb | |
| parent | 28af56dea5a88ffcaceb082cf67c9c1ab021609d (diff) | |
| parent | c8074b6b115c95c68d5f7df300a391b4eab521d5 (diff) | |
| download | gitlab-ce-f5a630111fb1499a1541e77040529f74ca6475ec.tar.gz | |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/models/merge_request.rb')
| -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 85f37e49e62..2eb03b8ba5b 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -20,6 +20,7 @@ # position :integer default(0) # locked_at :datetime # updated_by_id :integer +# merge_error :string(255) # require Rails.root.join("app/models/commit") @@ -40,7 +41,7 @@ class MergeRequest < ActiveRecord::Base after_create :create_merge_request_diff after_update :update_merge_request_diff - delegate :commits, :diffs, to: :merge_request_diff, prefix: nil + delegate :commits, :diffs, :diffs_no_whitespace, to: :merge_request_diff, prefix: nil # When this attribute is true some MR validation is ignored # It allows us to close or modify broken merge requests |