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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
5191285c
Commit
5191285c
authored
Mar 31, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'add-download-attr' into 'master'
Add download attribute to download links See merge request !10318
parents
32161042
20deca7c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
5 deletions
+6
-5
app/assets/javascripts/vue_pipelines_index/components/pipelines_artifacts.js
...pts/vue_pipelines_index/components/pipelines_artifacts.js
+1
-0
app/views/notify/project_was_exported_email.html.haml
app/views/notify/project_was_exported_email.html.haml
+1
-1
app/views/projects/artifacts/browse.html.haml
app/views/projects/artifacts/browse.html.haml
+1
-1
app/views/projects/builds/_sidebar.html.haml
app/views/projects/builds/_sidebar.html.haml
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
No files found.
app/assets/javascripts/vue_pipelines_index/components/pipelines_artifacts.js
View file @
5191285c
...
@@ -21,6 +21,7 @@ export default {
...
@@ -21,6 +21,7 @@ export default {
<li v-for="artifact in artifacts">
<li v-for="artifact in artifacts">
<a
<a
rel="nofollow"
rel="nofollow"
download
:href="artifact.path">
:href="artifact.path">
<i class="fa fa-download" aria-hidden="true"></i>
<i class="fa fa-download" aria-hidden="true"></i>
<span>Download {{artifact.name}} artifacts</span>
<span>Download {{artifact.name}} artifacts</span>
...
...
app/views/notify/project_was_exported_email.html.haml
View file @
5191285c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
Project
#{
@project
.
name
}
was exported successfully.
Project
#{
@project
.
name
}
was exported successfully.
%p
%p
The project export can be downloaded from:
The project export can be downloaded from:
=
link_to
download_export_namespace_project_url
(
@project
.
namespace
,
@project
)
do
=
link_to
download_export_namespace_project_url
(
@project
.
namespace
,
@project
)
,
rel:
'nofollow'
,
download:
''
,
do
=
@project
.
name_with_namespace
+
" export"
=
@project
.
name_with_namespace
+
" export"
%p
%p
The download link will expire in 24 hours.
The download link will expire in 24 hours.
app/views/projects/artifacts/browse.html.haml
View file @
5191285c
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.top-block.row-content-block.clearfix
.top-block.row-content-block.clearfix
.pull-right
.pull-right
=
link_to
download_namespace_project_build_artifacts_path
(
@project
.
namespace
,
@project
,
@build
),
=
link_to
download_namespace_project_build_artifacts_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn btn-default download'
do
rel:
'nofollow'
,
download:
''
,
class:
'btn btn-default download'
do
=
icon
(
'download'
)
=
icon
(
'download'
)
Download artifacts archive
Download artifacts archive
...
...
app/views/projects/builds/_sidebar.html.haml
View file @
5191285c
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
=
link_to
keep_namespace_project_build_artifacts_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn btn-sm btn-default'
,
method: :post
do
=
link_to
keep_namespace_project_build_artifacts_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn btn-sm btn-default'
,
method: :post
do
Keep
Keep
=
link_to
download_namespace_project_build_artifacts_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn btn-sm btn-default'
do
=
link_to
download_namespace_project_build_artifacts_path
(
@project
.
namespace
,
@project
,
@build
),
rel:
'nofollow'
,
download:
''
,
class:
'btn btn-sm btn-default'
do
Download
Download
-
if
@build
.
artifacts_metadata?
-
if
@build
.
artifacts_metadata?
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
5191285c
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
%td
%td
.pull-right
.pull-right
-
if
can?
(
current_user
,
:read_build
,
build
)
&&
build
.
artifacts?
-
if
can?
(
current_user
,
:read_build
,
build
)
&&
build
.
artifacts?
=
link_to
download_namespace_project_build_artifacts_path
(
build
.
project
.
namespace
,
build
.
project
,
build
),
title:
'Download artifacts'
,
class:
'btn btn-build'
do
=
link_to
download_namespace_project_build_artifacts_path
(
build
.
project
.
namespace
,
build
.
project
,
build
),
rel:
'nofollow'
,
download:
''
,
title:
'Download artifacts'
,
class:
'btn btn-build'
do
=
icon
(
'download'
)
=
icon
(
'download'
)
-
if
can?
(
current_user
,
:update_build
,
build
)
-
if
can?
(
current_user
,
:update_build
,
build
)
-
if
build
.
active?
-
if
build
.
active?
...
...
app/views/projects/edit.html.haml
View file @
5191285c
...
@@ -163,7 +163,7 @@
...
@@ -163,7 +163,7 @@
-
if
@project
.
export_project_path
-
if
@project
.
export_project_path
=
link_to
'Download export'
,
download_export_namespace_project_path
(
@project
.
namespace
,
@project
),
=
link_to
'Download export'
,
download_export_namespace_project_path
(
@project
.
namespace
,
@project
),
method: :get
,
class:
"btn btn-default"
rel:
'nofollow'
,
download:
''
,
method: :get
,
class:
"btn btn-default"
=
link_to
'Generate new export'
,
generate_new_export_namespace_project_path
(
@project
.
namespace
,
@project
),
=
link_to
'Generate new export'
,
generate_new_export_namespace_project_path
(
@project
.
namespace
,
@project
),
method: :post
,
class:
"btn btn-default"
method: :post
,
class:
"btn btn-default"
-
else
-
else
...
...
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