diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-12-21 09:22:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-12-21 09:22:51 +0000 |
| commit | 88f41bf61f5602aeca46c31d0b7ba76827543b29 (patch) | |
| tree | 5e42642e6e84404d52202ff9e60f71cf720d795a | |
| parent | a24b6dbfca310ffa605f87eb376679c3c627e688 (diff) | |
| parent | 6552c36495b5f0f0a662ac4a3fe05876893cc1e1 (diff) | |
| download | gitlab-ce-88f41bf61f5602aeca46c31d0b7ba76827543b29.tar.gz | |
Merge branch 'rs-remove-useless-definition' into 'master'
Remove a redundant `InvalidPathError` definition
See merge request gitlab-org/gitlab-ce!16064
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 770381472c5..d838b8dc29e 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -5,9 +5,6 @@ class Projects::BlobController < Projects::ApplicationController include RendersBlob include ActionView::Helpers::SanitizeHelper - # Raised when given an invalid file path - InvalidPathError = Class.new(StandardError) - prepend_before_action :authenticate_user!, only: [:edit] before_action :require_non_empty_project, except: [:new, :create] @@ -61,7 +58,6 @@ class Projects::BlobController < Projects::ApplicationController create_commit(Files::UpdateService, success_path: -> { after_edit_path }, failure_view: :edit, failure_path: project_blob_path(@project, @id)) - rescue Files::UpdateService::FileChangedError @conflict = true render :edit @@ -132,7 +128,6 @@ class Projects::BlobController < Projects::ApplicationController def assign_blob_vars @id = params[:id] @ref, @path = extract_ref(@id) - rescue InvalidPathError render_404 end |