diff options
| author | Jeff Stubler <brunsa2@gmail.com> | 2015-12-03 21:53:06 -0600 |
|---|---|---|
| committer | Jeff Stubler <brunsa2@gmail.com> | 2015-12-03 21:53:06 -0600 |
| commit | 932a7fd96f5977db6119205daa85495ea161dd68 (patch) | |
| tree | 251f02d786fcec000bacfb3d19e063a636fc9635 /app/models/merge_request.rb | |
| parent | 64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (diff) | |
| parent | e9d06903dab75129a0df63e686e18e85bfaeee8d (diff) | |
| download | gitlab-ce-932a7fd96f5977db6119205daa85495ea161dd68.tar.gz | |
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 85f37e49e62..1b3d6079d2c 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 @@ -133,6 +134,9 @@ class MergeRequest < ActiveRecord::Base scope :closed, -> { with_state(:closed) } scope :closed_and_merged, -> { with_states(:closed, :merged) } + scope :join_project, -> { joins(:target_project) } + scope :references_project, -> { references(:target_project) } + def self.reference_prefix '!' end @@ -472,7 +476,7 @@ class MergeRequest < ActiveRecord::Base end def ci_commit - if last_commit + if last_commit and source_project source_project.ci_commit(last_commit.id) end end |