diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-15 15:48:16 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-15 15:48:16 -0500 |
| commit | f5ab126fd0e607811638ca36b6752d5c74535adf (patch) | |
| tree | c4aa4e3933099095a7adfc37a307b62dab28dd9c /app/controllers/projects/commit_controller.rb | |
| parent | c29517aaf420b0d83f21d468b371260f4887cf00 (diff) | |
| download | gitlab-ce-f5ab126fd0e607811638ca36b6752d5c74535adf.tar.gz | |
Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467
Closes #13467
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 21f4d9f44ec..36951b91372 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -11,8 +11,6 @@ class Projects::CommitController < Projects::ApplicationController before_action :define_show_vars, only: [:show, :builds] def show - return git_not_found! unless @commit - apply_diff_view_cookie! @line_notes = commit.notes.inline @@ -68,6 +66,8 @@ class Projects::CommitController < Projects::ApplicationController end def define_show_vars + return git_not_found! unless commit + if params[:w].to_i == 1 @diffs = commit.diffs({ ignore_whitespace_change: true }) else |