Merge branch 'tsigo-routing_overhaul'

1 files changed, 29 insertions, 0 deletions

diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
new file mode 100644
index 00000000000..62f968fd1ed
--- /dev/null
+++ b/app/controllers/compare_controller.rb
@@ -0,0 +1,29 @@
+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 index
+  end
+
+  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
+
+  def create
+    redirect_to project_compare_path(@project, params[:from], params[:to])
+  end
+end