diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-08-31 18:14:14 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-07 10:22:57 +0300 |
| commit | 8b2e065b7b878b27f0494248b3734381291a67bd (patch) | |
| tree | 3a8154369d46a49df711e7b7a92d3f9708c4cb7a /app/helpers/merge_requests_helper.rb | |
| parent | 9b5a83816ec96b4c3a896c3d7c5edf358e62622f (diff) | |
| download | gitlab-ce-8b2e065b7b878b27f0494248b3734381291a67bd.tar.gz | |
Compare merge request version against other version on changes page
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index d5470d5d3c8..1379180cb6e 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -101,7 +101,9 @@ module MergeRequestsHelper return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) || merge_request.closed_without_fork? end - def compare_versions_path(project, version, base_version) - namespace_project_compare_path(project.namespace, project, base_version.head_commit_sha, version.head_commit_sha) + def mr_version_path(project, merge_request, merge_request_diff, start_sha = nil) + diffs_namespace_project_merge_request_path( + project.namespace, project, merge_request, + diff_id: merge_request_diff.id, start_sha: start_sha) end end |