diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
| commit | 4f24eb2aa670877faeef0f486af00d74e007ad01 (patch) | |
| tree | 3b8c9ccbe779050db829565910e8652392af4dcf /app/controllers/projects/compare_controller.rb | |
| parent | c6799b0e1ecd1b7373f0ea23195e18c7ad5c199d (diff) | |
| parent | fff36a8b8965e4bddd8020caf5072e79bf131a74 (diff) | |
| download | gitlab-ce-merge-notifs.tar.gz | |
Merge branch 'master' into merge-notifsmerge-notifs
Diffstat (limited to 'app/controllers/projects/compare_controller.rb')
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index c5f085c236f..d9b3adae95b 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -13,13 +13,8 @@ class Projects::CompareController < Projects::ApplicationController base_ref = Addressable::URI.unescape(params[:from]) @ref = head_ref = Addressable::URI.unescape(params[:to]) - compare_result = CompareService.new.execute( - current_user, - @project, - head_ref, - @project, - base_ref - ) + compare_result = CompareService.new. + execute(@project, head_ref, @project, base_ref) @commits = compare_result.commits @diffs = compare_result.diffs |