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
Boxiang Sun
gitlab-ce
Commits
8ceaafae
Commit
8ceaafae
authored
Sep 22, 2017
by
Phil Hughes
Committed by
Annabel Dunstone Gray
Sep 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed old icons from project page
parent
17251d04
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
29 deletions
+3
-29
app/assets/javascripts/pipelines/components/pipelines_actions.vue
...ts/javascripts/pipelines/components/pipelines_actions.vue
+1
-2
app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
.../javascripts/pipelines/components/pipelines_artifacts.vue
+1
-5
app/views/projects/buttons/_download.html.haml
app/views/projects/buttons/_download.html.haml
+0
-5
app/views/projects/buttons/_dropdown.html.haml
app/views/projects/buttons/_dropdown.html.haml
+0
-8
app/views/projects/tree/_old_tree_header.html.haml
app/views/projects/tree/_old_tree_header.html.haml
+0
-8
spec/javascripts/pipelines/pipelines_artifacts_spec.js
spec/javascripts/pipelines/pipelines_artifacts_spec.js
+1
-1
No files found.
app/assets/javascripts/pipelines/components/pipelines_actions.vue
View file @
8ceaafae
...
@@ -69,8 +69,7 @@
...
@@ -69,8 +69,7 @@
@
click=
"onClickAction(action.path)"
@
click=
"onClickAction(action.path)"
:class=
"
{ disabled: isActionDisabled(action) }"
:class=
"
{ disabled: isActionDisabled(action) }"
:disabled="isActionDisabled(action)">
:disabled="isActionDisabled(action)">
<span
v-html=
"playIconSvg"
></span>
{{
action
.
name
}}
<span>
{{
action
.
name
}}
</span>
</button>
</button>
</li>
</li>
</ul>
</ul>
...
...
app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
View file @
8ceaafae
...
@@ -39,11 +39,7 @@
...
@@ -39,11 +39,7 @@
rel=
"nofollow"
rel=
"nofollow"
download
download
:href=
"artifact.path"
>
:href=
"artifact.path"
>
<i
Download
{{
artifact
.
name
}}
artifacts
class=
"fa fa-download"
aria-hidden=
"true"
>
</i>
<span>
Download
{{
artifact
.
name
}}
artifacts
</span>
</a>
</a>
</li>
</li>
</ul>
</ul>
...
...
app/views/projects/buttons/_download.html.haml
View file @
8ceaafae
...
@@ -11,19 +11,15 @@
...
@@ -11,19 +11,15 @@
#{
_
(
'Source code'
)
}
#{
_
(
'Source code'
)
}
%li
%li
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'zip'
),
rel:
'nofollow'
,
download:
''
do
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'zip'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
=
_
(
'Download zip'
)
%span
=
_
(
'Download zip'
)
%li
%li
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'tar.gz'
),
rel:
'nofollow'
,
download:
''
do
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'tar.gz'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
=
_
(
'Download tar.gz'
)
%span
=
_
(
'Download tar.gz'
)
%li
%li
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'tar.bz2'
),
rel:
'nofollow'
,
download:
''
do
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'tar.bz2'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
=
_
(
'Download tar.bz2'
)
%span
=
_
(
'Download tar.bz2'
)
%li
%li
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'tar'
),
rel:
'nofollow'
,
download:
''
do
=
link_to
archive_project_repository_path
(
project
,
ref:
ref
,
format:
'tar'
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
=
_
(
'Download tar'
)
%span
=
_
(
'Download tar'
)
-
if
pipeline
&&
pipeline
.
latest_builds_with_artifacts
.
any?
-
if
pipeline
&&
pipeline
.
latest_builds_with_artifacts
.
any?
...
@@ -36,6 +32,5 @@
...
@@ -36,6 +32,5 @@
-
pipeline
.
latest_builds_with_artifacts
.
each
do
|
job
|
-
pipeline
.
latest_builds_with_artifacts
.
each
do
|
job
|
%li
%li
=
link_to
latest_succeeded_project_artifacts_path
(
project
,
"
#{
ref
}
/download"
,
job:
job
.
name
),
rel:
'nofollow'
,
download:
''
do
=
link_to
latest_succeeded_project_artifacts_path
(
project
,
"
#{
ref
}
/download"
,
job:
job
.
name
),
rel:
'nofollow'
,
download:
''
do
%i
.fa.fa-download
%span
%span
#{
s_
(
'DownloadArtifacts|Download'
)
}
'
#{
job
.
name
}
'
#{
s_
(
'DownloadArtifacts|Download'
)
}
'
#{
job
.
name
}
'
app/views/projects/buttons/_dropdown.html.haml
View file @
8ceaafae
...
@@ -11,19 +11,16 @@
...
@@ -11,19 +11,16 @@
-
if
can_create_issue
-
if
can_create_issue
%li
%li
=
link_to
new_project_issue_path
(
@project
)
do
=
link_to
new_project_issue_path
(
@project
)
do
=
icon
(
'exclamation-circle fw'
)
#{
_
(
'New issue'
)
}
#{
_
(
'New issue'
)
}
-
if
merge_project
-
if
merge_project
%li
%li
=
link_to
project_new_merge_request_path
(
merge_project
)
do
=
link_to
project_new_merge_request_path
(
merge_project
)
do
=
icon
(
'tasks fw'
)
#{
_
(
'New merge request'
)
}
#{
_
(
'New merge request'
)
}
-
if
can_create_snippet
-
if
can_create_snippet
%li
%li
=
link_to
new_project_snippet_path
(
@project
)
do
=
link_to
new_project_snippet_path
(
@project
)
do
=
icon
(
'file-text-o fw'
)
#{
_
(
'New snippet'
)
}
#{
_
(
'New snippet'
)
}
-
if
can_create_issue
||
merge_project
||
can_create_snippet
-
if
can_create_issue
||
merge_project
||
can_create_snippet
...
@@ -32,20 +29,16 @@
...
@@ -32,20 +29,16 @@
-
if
can?
(
current_user
,
:push_code
,
@project
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
%li
%li
=
link_to
project_new_blob_path
(
@project
,
@project
.
default_branch
||
'master'
)
do
=
link_to
project_new_blob_path
(
@project
,
@project
.
default_branch
||
'master'
)
do
=
icon
(
'file fw'
)
#{
_
(
'New file'
)
}
#{
_
(
'New file'
)
}
%li
%li
=
link_to
new_project_branch_path
(
@project
)
do
=
link_to
new_project_branch_path
(
@project
)
do
=
icon
(
'code-fork fw'
)
#{
_
(
'New branch'
)
}
#{
_
(
'New branch'
)
}
%li
%li
=
link_to
new_project_tag_path
(
@project
)
do
=
link_to
new_project_tag_path
(
@project
)
do
=
icon
(
'tags fw'
)
#{
_
(
'New tag'
)
}
#{
_
(
'New tag'
)
}
-
elsif
current_user
&&
current_user
.
already_forked?
(
@project
)
-
elsif
current_user
&&
current_user
.
already_forked?
(
@project
)
%li
%li
=
link_to
project_new_blob_path
(
@project
,
@project
.
default_branch
||
'master'
)
do
=
link_to
project_new_blob_path
(
@project
,
@project
.
default_branch
||
'master'
)
do
=
icon
(
'file fw'
)
#{
_
(
'New file'
)
}
#{
_
(
'New file'
)
}
-
elsif
can?
(
current_user
,
:fork_project
,
@project
)
-
elsif
can?
(
current_user
,
:fork_project
,
@project
)
%li
%li
...
@@ -55,5 +48,4 @@
...
@@ -55,5 +48,4 @@
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
continue:
continue_params
)
=
link_to
fork_path
,
method: :post
do
=
link_to
fork_path
,
method: :post
do
=
icon
(
'file fw'
)
#{
_
(
'New file'
)
}
#{
_
(
'New file'
)
}
app/views/projects/tree/_old_tree_header.html.haml
View file @
8ceaafae
...
@@ -20,15 +20,12 @@
...
@@ -20,15 +20,12 @@
-
if
can_edit_tree?
-
if
can_edit_tree?
%li
%li
=
link_to
project_new_blob_path
(
@project
,
@id
)
do
=
link_to
project_new_blob_path
(
@project
,
@id
)
do
=
icon
(
'pencil fw'
)
#{
_
(
'New file'
)
}
#{
_
(
'New file'
)
}
%li
%li
=
link_to
'#modal-upload-blob'
,
{
'data-target'
=>
'#modal-upload-blob'
,
'data-toggle'
=>
'modal'
}
do
=
link_to
'#modal-upload-blob'
,
{
'data-target'
=>
'#modal-upload-blob'
,
'data-toggle'
=>
'modal'
}
do
=
icon
(
'file fw'
)
#{
_
(
'Upload file'
)
}
#{
_
(
'Upload file'
)
}
%li
%li
=
link_to
'#modal-create-new-dir'
,
{
'data-target'
=>
'#modal-create-new-dir'
,
'data-toggle'
=>
'modal'
}
do
=
link_to
'#modal-create-new-dir'
,
{
'data-target'
=>
'#modal-create-new-dir'
,
'data-toggle'
=>
'modal'
}
do
=
icon
(
'folder fw'
)
#{
_
(
'New directory'
)
}
#{
_
(
'New directory'
)
}
-
elsif
can?
(
current_user
,
:fork_project
,
@project
)
-
elsif
can?
(
current_user
,
:fork_project
,
@project
)
%li
%li
...
@@ -38,7 +35,6 @@
...
@@ -38,7 +35,6 @@
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
continue:
continue_params
)
=
link_to
fork_path
,
method: :post
do
=
link_to
fork_path
,
method: :post
do
=
icon
(
'pencil fw'
)
#{
_
(
'New file'
)
}
#{
_
(
'New file'
)
}
%li
%li
-
continue_params
=
{
to:
request
.
fullpath
,
-
continue_params
=
{
to:
request
.
fullpath
,
...
@@ -47,7 +43,6 @@
...
@@ -47,7 +43,6 @@
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
continue:
continue_params
)
=
link_to
fork_path
,
method: :post
do
=
link_to
fork_path
,
method: :post
do
=
icon
(
'file fw'
)
#{
_
(
'Upload file'
)
}
#{
_
(
'Upload file'
)
}
%li
%li
-
continue_params
=
{
to:
request
.
fullpath
,
-
continue_params
=
{
to:
request
.
fullpath
,
...
@@ -56,15 +51,12 @@
...
@@ -56,15 +51,12 @@
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
-
fork_path
=
project_forks_path
(
@project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
continue:
continue_params
)
=
link_to
fork_path
,
method: :post
do
=
link_to
fork_path
,
method: :post
do
=
icon
(
'folder fw'
)
#{
_
(
'New directory'
)
}
#{
_
(
'New directory'
)
}
%li
.divider
%li
.divider
%li
%li
=
link_to
new_project_branch_path
(
@project
)
do
=
link_to
new_project_branch_path
(
@project
)
do
=
icon
(
'code-fork fw'
)
#{
_
(
'New branch'
)
}
#{
_
(
'New branch'
)
}
%li
%li
=
link_to
new_project_tag_path
(
@project
)
do
=
link_to
new_project_tag_path
(
@project
)
do
=
icon
(
'tags fw'
)
#{
_
(
'New tag'
)
}
#{
_
(
'New tag'
)
}
spec/javascripts/pipelines/pipelines_artifacts_spec.js
View file @
8ceaafae
...
@@ -34,7 +34,7 @@ describe('Pipelines Artifacts dropdown', () => {
...
@@ -34,7 +34,7 @@ describe('Pipelines Artifacts dropdown', () => {
).
toEqual
(
artifacts
[
0
].
path
);
).
toEqual
(
artifacts
[
0
].
path
);
expect
(
expect
(
component
.
$el
.
querySelector
(
'
.dropdown-menu li a
span
'
).
textContent
,
component
.
$el
.
querySelector
(
'
.dropdown-menu li a
'
).
textContent
,
).
toContain
(
artifacts
[
0
].
name
);
).
toContain
(
artifacts
[
0
].
name
);
});
});
});
});
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