Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f091272f
Commit
f091272f
authored
Dec 18, 2015
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move artifacts controller level up
This reverts nesting artifacts controller in builds module.
parent
a96d45c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
app/controllers/projects/artifacts_controller.rb
app/controllers/projects/artifacts_controller.rb
+2
-2
app/views/projects/artifacts/browse.html.haml
app/views/projects/artifacts/browse.html.haml
+0
-0
config/routes.rb
config/routes.rb
+3
-7
No files found.
app/controllers/projects/
builds/
artifacts_controller.rb
→
app/controllers/projects/artifacts_controller.rb
View file @
f091272f
class
Projects::
Builds::
ArtifactsController
<
Projects
::
ApplicationController
class
Projects::ArtifactsController
<
Projects
::
ApplicationController
layout
'project'
layout
'project'
before_action
:authorize_download_build_artifacts!
before_action
:authorize_download_build_artifacts!
...
@@ -14,7 +14,7 @@ class Projects::Builds::ArtifactsController < Projects::ApplicationController
...
@@ -14,7 +14,7 @@ class Projects::Builds::ArtifactsController < Projects::ApplicationController
send_file
artifacts_file
.
path
,
disposition:
'attachment'
send_file
artifacts_file
.
path
,
disposition:
'attachment'
end
end
def
view
def
browse
@metadata
=
build
.
artifacts_metadata
@metadata
=
build
.
artifacts_metadata
end
end
...
...
app/views/projects/
builds/artifacts/view
.html.haml
→
app/views/projects/
artifacts/browse
.html.haml
View file @
f091272f
File moved
config/routes.rb
View file @
f091272f
...
@@ -608,13 +608,9 @@ Rails.application.routes.draw do
...
@@ -608,13 +608,9 @@ Rails.application.routes.draw do
post
:retry
post
:retry
end
end
scope
module: :builds
do
resource
:artifacts
,
only:
[]
do
resource
:artifacts
,
only:
[]
do
get
:download
collection
do
get
'browse(/*path)'
,
action: :browse
,
as: :browse
get
:download
get
'view(/:path)'
,
as: :view
,
to:
'artifacts#view'
end
end
end
end
end
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