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
bf9e4826
Commit
bf9e4826
authored
Jun 08, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary icons from buttons
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1dc00173
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
5 additions
and
13 deletions
+5
-13
app/views/dashboard/_groups_head.html.haml
app/views/dashboard/_groups_head.html.haml
+0
-1
app/views/dashboard/_projects_head.html.haml
app/views/dashboard/_projects_head.html.haml
+0
-1
app/views/groups/group_members/_group_member.html.haml
app/views/groups/group_members/_group_member.html.haml
+2
-2
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+0
-1
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+0
-2
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+0
-1
app/views/projects/project_members/_group_members.html.haml
app/views/projects/project_members/_group_members.html.haml
+0
-1
app/views/projects/project_members/_project_member.html.haml
app/views/projects/project_members/_project_member.html.haml
+2
-2
app/views/shared/_new_project_item_select.html.haml
app/views/shared/_new_project_item_select.html.haml
+1
-2
No files found.
app/views/dashboard/_groups_head.html.haml
View file @
bf9e4826
...
@@ -9,5 +9,4 @@
...
@@ -9,5 +9,4 @@
-
if
current_user
.
can_create_group?
-
if
current_user
.
can_create_group?
.nav-controls
.nav-controls
=
link_to
new_group_path
,
class:
"btn btn-new"
do
=
link_to
new_group_path
,
class:
"btn btn-new"
do
=
icon
(
'plus'
)
New Group
New Group
app/views/dashboard/_projects_head.html.haml
View file @
bf9e4826
...
@@ -18,5 +18,4 @@
...
@@ -18,5 +18,4 @@
=
render
'shared/projects/dropdown'
=
render
'shared/projects/dropdown'
-
if
current_user
.
can_create_project?
-
if
current_user
.
can_create_project?
=
link_to
new_project_path
,
class:
'btn btn-new'
do
=
link_to
new_project_path
,
class:
'btn btn-new'
do
=
icon
(
'plus'
)
New Project
New Project
app/views/groups/group_members/_group_member.html.haml
View file @
bf9e4826
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
-
if
can?
(
current_user
,
:update_group_member
,
member
)
-
if
can?
(
current_user
,
:update_group_member
,
member
)
=
button_tag
class:
"btn-xs btn js-toggle-button"
,
=
button_tag
class:
"btn-xs btn js-toggle-button"
,
title:
'Edit access level'
,
type:
'button'
do
title:
'Edit access level'
,
type:
'button'
do
%i
.fa.fa-pencil-square-o
=
icon
(
'pencil'
)
-
if
can?
(
current_user
,
:destroy_group_member
,
member
)
-
if
can?
(
current_user
,
:destroy_group_member
,
member
)
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
Leave
Leave
-
else
-
else
=
link_to
group_group_member_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
member
)
},
method: :delete
,
remote:
true
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from group'
do
=
link_to
group_group_member_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
member
)
},
method: :delete
,
remote:
true
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from group'
do
%i
.fa.fa-minus.fa-inverse
=
icon
(
'trash'
)
.edit-member.hide.js-toggle-content
.edit-member.hide.js-toggle-content
%br
%br
...
...
app/views/groups/show.html.haml
View file @
bf9e4826
...
@@ -35,7 +35,6 @@
...
@@ -35,7 +35,6 @@
=
render
'shared/projects/dropdown'
=
render
'shared/projects/dropdown'
-
if
can?
current_user
,
:create_projects
,
@group
-
if
can?
current_user
,
:create_projects
,
@group
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
'btn btn-new pull-right'
do
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
'btn btn-new pull-right'
do
=
icon
(
'plus'
)
New Project
New Project
.tab-content
.tab-content
...
...
app/views/projects/branches/_branch.html.haml
View file @
bf9e4826
...
@@ -21,12 +21,10 @@
...
@@ -21,12 +21,10 @@
.controls.hidden-xs
.controls.hidden-xs
-
if
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
-
if
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
=
link_to
create_mr_path
(
@repository
.
root_ref
,
branch
.
name
),
class:
'btn btn-grouped btn-xs'
do
=
link_to
create_mr_path
(
@repository
.
root_ref
,
branch
.
name
),
class:
'btn btn-grouped btn-xs'
do
=
icon
(
'plus'
)
Merge Request
Merge Request
-
if
branch
.
name
!=
@repository
.
root_ref
-
if
branch
.
name
!=
@repository
.
root_ref
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
branch
.
name
),
class:
'btn btn-grouped btn-xs'
,
method: :post
,
title:
"Compare"
do
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
branch
.
name
),
class:
'btn btn-grouped btn-xs'
,
method: :post
,
title:
"Compare"
do
=
icon
(
"exchange"
)
Compare
Compare
-
if
can_remove_branch?
(
@project
,
branch
.
name
)
-
if
can_remove_branch?
(
@project
,
branch
.
name
)
...
...
app/views/projects/labels/index.html.haml
View file @
bf9e4826
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
.nav-controls
.nav-controls
-
if
can?
(
current_user
,
:admin_label
,
@project
)
-
if
can?
(
current_user
,
:admin_label
,
@project
)
=
link_to
new_namespace_project_label_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
do
=
link_to
new_namespace_project_label_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
do
=
icon
(
'plus'
)
New label
New label
.labels
.labels
...
...
app/views/projects/project_members/_group_members.html.haml
View file @
bf9e4826
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
.controls
.controls
=
link_to
group_group_members_path
(
@group
),
class:
'btn'
do
=
link_to
group_group_members_path
(
@group
),
class:
'btn'
do
=
icon
(
'pencil-square-o'
)
Manage group members
Manage group members
%ul
.content-list
%ul
.content-list
-
members
.
limit
(
20
).
each
do
|
member
|
-
members
.
limit
(
20
).
each
do
|
member
|
...
...
app/views/projects/project_members/_project_member.html.haml
View file @
bf9e4826
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
-
if
can?
(
current_user
,
:update_project_member
,
member
)
-
if
can?
(
current_user
,
:update_project_member
,
member
)
=
button_tag
class:
"btn-xs btn js-toggle-button"
,
=
button_tag
class:
"btn-xs btn js-toggle-button"
,
title:
'Edit access level'
,
type:
'button'
do
title:
'Edit access level'
,
type:
'button'
do
%i
.fa.fa-pencil-square-o
=
icon
(
'pencil'
)
-
if
can?
(
current_user
,
:destroy_project_member
,
member
)
-
if
can?
(
current_user
,
:destroy_project_member
,
member
)
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
Leave
Leave
-
else
-
else
=
link_to
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
member
),
data:
{
confirm:
remove_from_project_team_message
(
@project
,
member
)
},
method: :delete
,
remote:
true
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from team'
do
=
link_to
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
member
),
data:
{
confirm:
remove_from_project_team_message
(
@project
,
member
)
},
method: :delete
,
remote:
true
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from team'
do
%i
.fa.fa-minus.fa-inverse
=
icon
(
'trash'
)
.edit-member.hide.js-toggle-content
.edit-member.hide.js-toggle-content
%br
%br
...
...
app/views/shared/_new_project_item_select.html.haml
View file @
bf9e4826
-
if
@projects
.
any?
-
if
@projects
.
any?
.pr
epend-left-10.pr
oject-item-select-holder
.project-item-select-holder
=
project_select_tag
:project_path
,
class:
"project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
],
order_by:
'last_activity_at'
}
=
project_select_tag
:project_path
,
class:
"project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
],
order_by:
'last_activity_at'
}
%a
.btn.btn-new.new-project-item-select-button
%a
.btn.btn-new.new-project-item-select-button
=
icon
(
'plus'
)
=
local_assigns
[
:label
]
=
local_assigns
[
:label
]
%b
.caret
%b
.caret
...
...
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