summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-20 15:20:48 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-26 16:32:22 -0400
commit169f16fb32091701bcaa962872ea35b5772a1539 (patch)
tree635b3cce7bda2272ca399b822886ded5b82db4a4 /app/controllers
parent5a5d214de499b678802ac12c5c6cbe583a85ae36 (diff)
downloadgitlab-ce-169f16fb32091701bcaa962872ea35b5772a1539.tar.gz
Remove Commits#compare, add CompareController
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/commits_controller.rb12
-rw-r--r--app/controllers/compare_controller.rb22
2 files changed, 22 insertions, 12 deletions
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
index 712b842c66d..b508d2877a4 100644
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -45,18 +45,6 @@ class CommitsController < ApplicationController
# end
# end
- def compare
- result = Commit.compare(project, params[:from], params[:to])
-
- @commits = result[:commits]
- @commit = result[:commit]
- @diffs = result[:diffs]
- @refs_are_same = result[:same]
- @line_notes = []
-
- @commits = CommitDecorator.decorate(@commits)
- end
-
def patch
@commit = project.commit(params[:id])
diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
new file mode 100644
index 00000000000..1124fd0caa3
--- /dev/null
+++ b/app/controllers/compare_controller.rb
@@ -0,0 +1,22 @@
+class CompareController < ApplicationController
+ before_filter :project
+ layout "project"
+
+ # Authorize
+ before_filter :add_project_abilities
+ before_filter :authorize_read_project!
+ before_filter :authorize_code_access!
+ before_filter :require_non_empty_project
+
+ def show
+ result = Commit.compare(project, params[:from], params[:to])
+
+ @commits = result[:commits]
+ @commit = result[:commit]
+ @diffs = result[:diffs]
+ @refs_are_same = result[:same]
+ @line_notes = []
+
+ @commits = CommitDecorator.decorate(@commits)
+ end
+end