diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-09 00:50:54 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-09 00:50:54 +0100 |
| commit | 85e8acedaf1d4e51335c59a0efa2f95576a4fde3 (patch) | |
| tree | 9b21d76626568158cf746e2a7eb4853efe3aa0d5 /app/controllers/projects/blob_controller.rb | |
| parent | cdcade0dd4e748bcf0119b307c06993e0669f507 (diff) | |
| parent | bd50ecbad8c00e7c9ab5c60fa8bc839a8905b4ab (diff) | |
| download | gitlab-ce-move-project-dropdown.tar.gz | |
Resolved conflictsmove-project-dropdown
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -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 |