diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-10 21:53:41 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-10 21:53:41 +0000 |
commit | 9bcc9ec14cf4f120b8e16d5c232f82e1fc5e2cfd (patch) | |
tree | 6ebbaa158b9bf2c71f0046d14eddd07729f62ddd /app/models/merge_request.rb | |
parent | 42607a7f175ead8494b12f1c94734eb3b6a16ca1 (diff) | |
parent | c1541fdf1ebe15cd6321b0f27337bbcc17891ac8 (diff) | |
download | gitlab-ce-9bcc9ec14cf4f120b8e16d5c232f82e1fc5e2cfd.tar.gz |
Merge branch 'display-mr-link-if-thre-is-one' into 'master'
Replaces "Create merge request" link with one to the MR when one exists
Fixes #3716
* Without MR:

* With MR:

* Without MR:

* With MR:

* Without MR:

* With MR:

See merge request !2670
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ddc476447ca..345b9a26d4e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -137,6 +137,7 @@ class MergeRequest < ActiveRecord::Base scope :by_milestone, ->(milestone) { where(milestone_id: milestone) } scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) } scope :of_projects, ->(ids) { where(target_project_id: ids) } + scope :opened, -> { with_state(:opened) } scope :merged, -> { with_state(:merged) } scope :closed, -> { with_state(:closed) } scope :closed_and_merged, -> { with_states(:closed, :merged) } |