diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-06 20:08:06 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-07 10:24:48 +0300 |
commit | 5f0535ac91cdf2a892fb697dc05f0930f2c6d434 (patch) | |
tree | 70beec88b3605598d94a4e6626a99b8e13d2ba2a /app/helpers/merge_requests_helper.rb | |
parent | ffdfdc27e5f7d72f7ed48ece2dc06154e0c5b49e (diff) | |
download | gitlab-ce-5f0535ac91cdf2a892fb697dc05f0930f2c6d434.tar.gz |
Improve merge request version feature
* Use version numbers instead of sha as more user-friendly
* Make it clear that we compare later version (left) with older one (right)
* Improve wording of version switch panel
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r-- | app/helpers/merge_requests_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 08ceaf9b4ca..8abe7865fed 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -106,4 +106,8 @@ module MergeRequestsHelper project.namespace, project, merge_request, diff_id: merge_request_diff.id, start_sha: start_sha) end + + def version_index(merge_request_diff) + @merge_request_diffs.size - @merge_request_diffs.index(merge_request_diff) + end end |