diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-11 16:58:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-11 16:58:21 +0300 |
| commit | 3816387cc95098632c9acbafb516e2cde0d9fee7 (patch) | |
| tree | ea72132cdf0dfdb336ccedc529a41a224216f619 /app/controllers/commit_controller.rb | |
| parent | e06e5633b38ba988135e5ee1ead33a9bbfadd361 (diff) | |
| parent | 9db06da4fa5fc42859dce01a91cc607c7ba9f738 (diff) | |
| download | gitlab-ce-3816387cc95098632c9acbafb516e2cde0d9fee7.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app/controllers/commit_controller.rb')
| -rw-r--r-- | app/controllers/commit_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/commit_controller.rb b/app/controllers/commit_controller.rb index 1329410891d..0f696ef9f5a 100644 --- 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] |