diff options
author | Rémy Coutable <remy@rymai.me> | 2017-09-28 20:15:32 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-09-28 20:15:32 +0300 |
commit | 0ab2ff72a4968ebf9f6e1eb41b46edbe3b5486ef (patch) | |
tree | fe6f861c36f7c4e53c0d08866282221bf952cf04 /app/helpers | |
parent | 69f0370ad398db0202e3d0cf8459145ea08826dd (diff) | |
parent | 796e58e1a392c3664be64cf43582de3e0f80b764 (diff) |
Merge branch 'bvl-fix-close-issuable-link' into 'master'
Use relative paths for opening and closing issuables
Closes #35822
See merge request gitlab-org/gitlab-ce!14555
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/issuables_helper.rb | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index df390dd5aab..7713fb0b9f8 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -248,16 +248,25 @@ module IssuablesHelper Gitlab::IssuablesCountForState.new(finder)[state] end - def close_issuable_url(issuable) - issuable_url(issuable, close_reopen_params(issuable, :close)) + def close_issuable_path(issuable) + issuable_path(issuable, close_reopen_params(issuable, :close)) end - def reopen_issuable_url(issuable) - issuable_url(issuable, close_reopen_params(issuable, :reopen)) + def reopen_issuable_path(issuable) + issuable_path(issuable, close_reopen_params(issuable, :reopen)) end - def close_reopen_issuable_url(issuable, should_inverse = false) - issuable.closed? ^ should_inverse ? reopen_issuable_url(issuable) : close_issuable_url(issuable) + def close_reopen_issuable_path(issuable, should_inverse = false) + issuable.closed? ^ should_inverse ? reopen_issuable_path(issuable) : close_issuable_path(issuable) + end + + def issuable_path(issuable, *options) + case issuable + when Issue + issue_path(issuable, *options) + when MergeRequest + merge_request_path(issuable, *options) + end end def issuable_url(issuable, *options) |