BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6552c364
Commit
6552c364
authored
Dec 20, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove a redundant `InvalidPathError` definition
This is already defined in `ExtractsPath`, which this controller includes.
parent
ecd1b816
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
5 deletions
+0
-5
blob_controller.rb
app/controllers/projects/blob_controller.rb
+0
-5
No files found.
app/controllers/projects/blob_controller.rb
View file @
6552c364
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment