Merge branch 'master' of github.com:gitlabhq/gitlabhq

3816387c · Dmitriy Zaporozhets · e06e5633 · 9db06da4 · 3816387c
Commit 3816387c authored Jun 11, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

app/controllers/commit_controller.rb app/controllers/commit_controller.rb +5 -1

No files found.
--- a/app/controllers/commit_controller.rb
+++ b/app/controllers/commit_controller.rb
@@ -11,7 +11,11 @@ class CommitController < ProjectResourceController
    result = CommitLoadContext.new(project, current_user, params).execute

    @commit = result[:commit]
-    git_not_found! unless @commit
+    
+    if @commit.nil?
+      git_not_found!
+      return
+    end

    @suppress_diff = result[:suppress_diff]