diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-10-18 15:07:28 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-10-18 15:07:28 +0300 |
commit | 41615ddde4d5ae70bef944d9b156b687af2ca532 (patch) | |
tree | faafdceffcafc9e241452eea2beb2920d98b946e /app/models/concerns | |
parent | 38785046f7ec7d834e22add66e4be88f6e985355 (diff) | |
parent | be10eea95632ba2d6553f0098d9d8536eef1f7c4 (diff) |
Merge branch 'cross-reference-mr-on-issues' into 'master'
Show merge requests which close current issue
Closes #2903
### What does this MR do
If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue.
![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png)
/cc @DouweM
See merge request !1569
Diffstat (limited to 'app/models/concerns')
-rw-r--r-- | app/models/concerns/issuable.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 1d85a353a6b..5e964f04ef5 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -85,6 +85,10 @@ module Issuable assignee_id_changed? end + def open? + opened? || reopened? + end + # # Votes # |