summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorScott Le <scott.lee318@gmail.com>2016-07-28 11:04:57 +0700
committerScott Le <scott.lee318@gmail.com>2016-08-11 23:37:00 +0700
commit6109daf480327581b6e2dcdfffe90464be6c7796 (patch)
tree813f1d607d89c94873ae31633acb9091c8a0e287 /app/models
parent5a33bc984abfb4ee6243c00bbcc71ccd086d2266 (diff)
downloadgitlab-ce-6109daf480327581b6e2dcdfffe90464be6c7796.tar.gz
api for generating new merge request
DRY code + fix rubocop Add more test cases Append to changelog DRY changes list find_url service for merge_requests use GET for getting merge request links remove files rename to get_url_service reduce loop add test case for cross project refactor tiny thing update changelog
Diffstat (limited to 'app/models')
-rw-r--r--app/models/merge_request.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b1fb3ce5d69..f6d0d0c98f5 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -104,6 +104,7 @@ class MergeRequest < ActiveRecord::Base
scope :from_project, ->(project) { where(source_project_id: project.id) }
scope :merged, -> { with_state(:merged) }
scope :closed_and_merged, -> { with_states(:closed, :merged) }
+ scope :from_source_branches, ->(branches) { where(source_branch: branches) }
scope :join_project, -> { joins(:target_project) }
scope :references_project, -> { references(:target_project) }