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
bf07af9b
Commit
bf07af9b
authored
Feb 16, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '26957-tanuki-anim-hang' into 'master'
don't trigger tanuki loader when downloading files See merge request !9290
parents
f86c4938
1a299121
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
6 deletions
+26
-6
pipeline_actions.js.es6
...s/javascripts/vue_pipelines_index/pipeline_actions.js.es6
+1
-0
_download.html.haml
app/views/projects/buttons/_download.html.haml
+5
-5
_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
26957-tanuki-anim-hang.yml
changelogs/unreleased/26957-tanuki-anim-hang.yml
+4
-0
download_buttons_spec.rb
spec/features/projects/main/download_buttons_spec.rb
+7
-0
pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+8
-0
No files found.
app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
View file @
bf07af9b
...
...
@@ -62,6 +62,7 @@
<li v-for='artifact in pipeline.details.artifacts'>
<a
rel="nofollow"
download
:href='artifact.path'
>
<i class="fa fa-download" aria-hidden="true"></i>
...
...
app/views/projects/buttons/_download.html.haml
View file @
bf07af9b
...
...
@@ -8,19 +8,19 @@
%ul
.dropdown-menu.dropdown-menu-align-right
{
role:
'menu'
}
%li
.dropdown-header
Source code
%li
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'zip'
),
rel:
'nofollow'
do
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'zip'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
Download zip
%li
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar.gz'
),
rel:
'nofollow'
do
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar.gz'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
Download tar.gz
%li
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar.bz2'
),
rel:
'nofollow'
do
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar.bz2'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
Download tar.bz2
%li
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar'
),
rel:
'nofollow'
do
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
Download tar
...
...
@@ -36,6 +36,6 @@
%li
.dropdown-header
Previous Artifacts
-
artifacts
.
each
do
|
job
|
%li
=
link_to
latest_succeeded_namespace_project_artifacts_path
(
project
.
namespace
,
project
,
"
#{
ref
}
/download"
,
job:
job
.
name
),
rel:
'nofollow'
do
=
link_to
latest_succeeded_namespace_project_artifacts_path
(
project
.
namespace
,
project
,
"
#{
ref
}
/download"
,
job:
job
.
name
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
Download '
#{
job
.
name
}
'
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
bf07af9b
...
...
@@ -78,7 +78,7 @@
%ul
.dropdown-menu.dropdown-menu-align-right
-
artifacts
.
each
do
|
build
|
%li
=
link_to
download_namespace_project_build_artifacts_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
build
),
rel:
'nofollow'
do
=
link_to
download_namespace_project_build_artifacts_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
build
),
rel:
'nofollow'
,
download:
''
do
=
icon
(
"download"
)
%span
Download '
#{
build
.
name
}
' artifacts
...
...
changelogs/unreleased/26957-tanuki-anim-hang.yml
0 → 100644
View file @
bf07af9b
---
title
:
don't animate logo when downloading files
merge_request
:
author
:
spec/features/projects/main/download_buttons_spec.rb
View file @
bf07af9b
...
...
@@ -39,6 +39,13 @@ feature 'Download buttons in project main page', feature: true do
expect
(
page
).
to
have_link
"Download '
#{
build
.
name
}
'"
,
href:
href
end
scenario
'download links have download attribute'
do
expect
(
page
).
to
have_selector
(
'a'
,
text:
'Download'
)
page
.
all
(
'a'
,
text:
'Download'
).
each
do
|
link
|
expect
(
link
[
:download
]).
to
eq
''
end
end
end
end
end
spec/features/projects/pipelines/pipelines_spec.rb
View file @
bf07af9b
...
...
@@ -218,6 +218,14 @@ describe 'Pipelines', :feature, :js do
expect
(
page
).
to
have_link
(
with_artifacts
.
name
)
end
it
'has download attribute on download links'
do
find
(
'.js-pipeline-dropdown-download'
).
click
expect
(
page
).
to
have_selector
(
'a'
,
text:
'Download'
)
page
.
all
(
'.build-artifacts a'
,
text:
'Download'
).
each
do
|
link
|
expect
(
link
[
:download
]).
to
eq
''
end
end
end
context
'with artifacts expired'
do
...
...
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