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
8f197315
Commit
8f197315
authored
Aug 24, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aggressively merge views, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14347679
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14347470
parent
e65bc0f1
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
37 additions
and
86 deletions
+37
-86
lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-4
_branch.html.haml
app/views/projects/branches/_branch.html.haml
+1
-9
_artifacts.html.haml
app/views/projects/buttons/_artifacts.html.haml
+0
-14
_download.html.haml
app/views/projects/buttons/_download.html.haml
+31
-7
_download_archive.html.haml
app/views/projects/repositories/_download_archive.html.haml
+0
-28
show.html.haml
app/views/projects/show.html.haml
+2
-3
_download.html.haml
app/views/projects/tags/_download.html.haml
+0
-15
_tag.html.haml
app/views/projects/tags/_tag.html.haml
+1
-2
show.html.haml
app/views/projects/tags/show.html.haml
+1
-2
show.html.haml
app/views/projects/tree/show.html.haml
+1
-2
No files found.
app/assets/stylesheets/framework/lists.scss
View file @
8f197315
...
...
@@ -162,10 +162,6 @@ ul.content-list {
margin-right
:
0
;
}
}
.artifacts-btn
{
margin-right
:
10px
;
}
}
// When dragging a list item
...
...
app/views/projects/branches/_branch.html.haml
View file @
8f197315
...
...
@@ -27,15 +27,7 @@
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
branch
.
name
),
class:
'btn btn-default'
,
method: :post
,
title:
"Compare"
do
Compare
-
if
@project
.
latest_successful_builds_for
(
branch
.
name
).
any?
.dropdown.inline.artifacts-btn
%a
.btn.dropdown-toggle
{
'data-toggle'
=>
'dropdown'
}
=
icon
(
'download'
)
%span
.caret
%span
.sr-only
Select Archive Format
%ul
.dropdown-menu.dropdown-menu-align-right
{
role:
'menu'
}
=
render
'projects/buttons/artifacts'
,
project:
@project
,
ref:
branch
.
name
=
render
'projects/buttons/download'
,
project:
@project
,
ref:
branch
.
name
-
if
can_remove_branch?
(
@project
,
branch
.
name
)
=
link_to
namespace_project_branch_path
(
@project
.
namespace
,
@project
,
branch
.
name
),
class:
'btn btn-remove remove-row has-tooltip'
,
title:
"Delete branch"
,
method: :delete
,
data:
{
confirm:
"Deleting the '
#{
branch
.
name
}
' branch cannot be undone. Are you sure?"
,
container:
'body'
},
remote:
true
do
...
...
app/views/projects/buttons/_artifacts.html.haml
deleted
100644 → 0
View file @
e65bc0f1
-
pipeline
=
project
.
pipelines
.
latest_successful_for
(
ref
)
-
if
pipeline
-
artifacts
=
pipeline
.
builds
.
latest
.
with_artifacts
-
if
artifacts
.
any?
%li
.dropdown-header
Artifacts
-
unless
pipeline
.
latest?
-
latest_pipeline
=
project
.
pipeline_for
(
ref
)
%li
.unclickable
=
ci_status_for_statuseable
(
latest_pipeline
)
%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
%span
Download '
#{
job
.
name
}
'
app/views/projects/buttons/_download.html.haml
View file @
8f197315
-
unless
@project
.
empty_repo?
-
if
can?
current_user
,
:download_code
,
@project
.dropdown.inline
.btn-group
-
if
!
project
.
empty_repo?
&&
can?
(
current_user
,
:download_code
,
project
)
%span
.btn-group
{
class:
'hidden-xs hidden-sm btn-grouped'
}
.dropdown.inline
%button
.btn
{
'data-toggle'
=>
'dropdown'
}
=
icon
(
'download'
)
=
icon
(
'caret-down'
)
%span
.caret
%span
.sr-only
Select Archive Format
%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'
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'
do
%i
.fa.fa-download
%span
Download tar.gz
=
render
'projects/buttons/artifacts'
,
project:
@project
,
ref:
@ref
%li
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar.bz2'
),
rel:
'nofollow'
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
%i
.fa.fa-download
%span
Download tar
-
pipeline
=
project
.
pipelines
.
latest_successful_for
(
ref
)
-
if
pipeline
-
artifacts
=
pipeline
.
builds
.
latest
.
with_artifacts
-
if
artifacts
.
any?
%li
.dropdown-header
Artifacts
-
unless
pipeline
.
latest?
-
latest_pipeline
=
project
.
pipeline_for
(
ref
)
%li
.unclickable
=
ci_status_for_statuseable
(
latest_pipeline
)
%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
%span
Download '
#{
job
.
name
}
'
app/views/projects/repositories/_download_archive.html.haml
deleted
100644 → 0
View file @
e65bc0f1
-
ref
=
ref
||
nil
-
btn_class
=
btn_class
||
''
%span
.btn-group
{
class:
btn_class
}
.dropdown.inline
%button
.btn
{
'data-toggle'
=>
'dropdown'
}
=
icon
(
'download'
)
%span
.caret
%span
.sr-only
Select Archive Format
%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
%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
%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
%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
%i
.fa.fa-download
%span
Download tar
=
render
'projects/buttons/artifacts'
,
project:
@project
,
ref:
ref
app/views/projects/show.html.haml
View file @
8f197315
...
...
@@ -70,7 +70,7 @@
=
render
'shared/members/access_request_buttons'
,
source:
@project
.btn-group.project-repo-btn-group
=
render
"projects/buttons/download"
=
render
'projects/buttons/download'
,
project:
@project
,
ref:
@ref
=
render
'projects/buttons/dropdown'
=
render
'shared/notifications/button'
,
notification_setting:
@notification_setting
...
...
@@ -86,4 +86,4 @@
Archived project! Repository is read-only
%div
{
class:
"project-show-#{default_project_view}"
}
=
render
default_project_view
\ No newline at end of file
=
render
default_project_view
app/views/projects/tags/_download.html.haml
deleted
100644 → 0
View file @
e65bc0f1
.dropdown.inline
%a
.btn.dropdown-toggle
{
'data-toggle'
=>
'dropdown'
}
=
icon
(
'download'
)
%span
.caret
%span
.sr-only
Select Archive Format
%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
%span
Download zip
%li
=
link_to
archive_namespace_project_repository_path
(
project
.
namespace
,
project
,
ref:
ref
,
format:
'tar.gz'
),
rel:
'nofollow'
do
%span
Download tar.gz
=
render
'projects/buttons/artifacts'
,
project:
project
,
ref:
ref
app/views/projects/tags/_tag.html.haml
View file @
8f197315
...
...
@@ -11,8 +11,7 @@
=
strip_gpg_signature
(
tag
.
message
)
.controls
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'projects/tags/download'
,
ref:
tag
.
name
,
project:
@project
=
render
'projects/buttons/download'
,
project:
@project
,
ref:
tag
.
name
-
if
can?
(
current_user
,
:push_code
,
@project
)
=
link_to
edit_namespace_project_tag_release_path
(
@project
.
namespace
,
@project
,
tag
.
name
),
class:
'btn has-tooltip'
,
title:
"Edit release notes"
,
data:
{
container:
"body"
}
do
...
...
app/views/projects/tags/show.html.haml
View file @
8f197315
...
...
@@ -12,8 +12,7 @@
=
icon
(
'files-o'
)
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@tag
.
name
),
class:
'btn has-tooltip'
,
title:
'Browse commits'
do
=
icon
(
'history'
)
-
if
can?
current_user
,
:download_code
,
@project
=
render
'projects/tags/download'
,
ref:
@tag
.
name
,
project:
@project
=
render
'projects/buttons/download'
,
project:
@project
,
ref:
@tag
.
name
-
if
can?
(
current_user
,
:admin_project
,
@project
)
.pull-right
=
link_to
namespace_project_tag_path
(
@project
.
namespace
,
@project
,
@tag
.
name
),
class:
'btn btn-remove remove-row grouped has-tooltip'
,
title:
"Delete tag"
,
method: :delete
,
data:
{
confirm:
"Deleting the '
#{
@tag
.
name
}
' tag cannot be undone. Are you sure?"
}
do
...
...
app/views/projects/tree/show.html.haml
View file @
8f197315
...
...
@@ -10,8 +10,7 @@
%div
{
class:
container_class
}
.tree-controls
=
render
'projects/find_file_link'
-
if
can?
current_user
,
:download_code
,
@project
=
render
'projects/repositories/download_archive'
,
ref:
@ref
,
btn_class:
'hidden-xs hidden-sm btn-grouped'
=
render
'projects/buttons/download'
,
project:
@project
,
ref:
@ref
#tree-holder
.tree-holder.clearfix
.nav-block
...
...
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