[refs #907] fixed 404 in branch with dots

app/controllers/projects/git/commits_controller.rb

@@ -20,12 +20,13 @@ class Projects::Git::CommitsController < Projects::Git::BaseController
   end
 
   def diff
-    if params[:commit2].present?
-      params1 = params[:commit1]
-      params2 = params[:commit2] == 'HEAD' ? @project.default_branch : params[:commit2]
+    res = params[:diff].split(/\A(.*)\.\.\.(.*)\z/).select {|e| e.present?}
+    if res[1].present?
+      params1 = res[0]
+      params2 = res[1] == 'HEAD' ? @project.default_branch : res.last
     else # get only one parameter
       params1 = @project.default_branch
-      params2 = params[:commit1]
+      params2 = res.first
     end
     params1.sub! 'HEAD', @project.default_branch
     params2.sub! 'HEAD', @project.default_branch

config/routes.rb

@@ -317,7 +317,7 @@ Rosa::Application.routes.draw do
           # Archive
           get '/archive/:treeish.:format' => "git/trees#archive", :as => :archive, :format => /zip|tar\.gz/
           # Git diff
-          get '/diff/:commit1(...:commit2)' => "git/commits#diff", :as => :diff
+          get '/diff/:diff' => "git/commits#diff", :as => :diff, :format => false, :diff => /.*/
         end
       end
     end