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
55d98090
Commit
55d98090
authored
Sep 30, 2014
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert Javascript links to buttons.
parent
ada6c608
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
15 additions
and
14 deletions
+15
-14
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
app/views/explore/groups/index.html.haml
app/views/explore/groups/index.html.haml
+1
-1
app/views/explore/projects/index.html.haml
app/views/explore/projects/index.html.haml
+1
-1
app/views/groups/group_members/_group_member.html.haml
app/views/groups/group_members/_group_member.html.haml
+2
-1
app/views/groups/members.html.haml
app/views/groups/members.html.haml
+1
-1
app/views/projects/branches/index.html.haml
app/views/projects/branches/index.html.haml
+1
-1
app/views/search/_filter.html.haml
app/views/search/_filter.html.haml
+2
-2
app/views/shared/_issuable_filter.html.haml
app/views/shared/_issuable_filter.html.haml
+4
-4
app/views/shared/_sort_dropdown.html.haml
app/views/shared/_sort_dropdown.html.haml
+1
-1
features/steps/groups.rb
features/steps/groups.rb
+1
-1
No files found.
app/views/admin/projects/index.html.haml
View file @
55d98090
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
Projects (
#{
@projects
.
total_count
}
)
Projects (
#{
@projects
.
total_count
}
)
.panel-head-actions
.panel-head-actions
.dropdown.inline
.dropdown.inline
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
%span
.light
sort:
-
if
@sort
.
present?
-
if
@sort
.
present?
=
@sort
.
humanize
=
@sort
.
humanize
...
...
app/views/explore/groups/index.html.haml
View file @
55d98090
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
.pull-right
.pull-right
.dropdown.inline
.dropdown.inline
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
%span
.light
sort:
-
if
@sort
.
present?
-
if
@sort
.
present?
=
@sort
.
humanize
=
@sort
.
humanize
...
...
app/views/explore/projects/index.html.haml
View file @
55d98090
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
.pull-right
.pull-right
.dropdown.inline
.dropdown.inline
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
%span
.light
sort:
-
if
@sort
.
present?
-
if
@sort
.
present?
=
@sort
.
humanize
=
@sort
.
humanize
...
...
app/views/groups/group_members/_group_member.html.haml
View file @
55d98090
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
%strong
=
member
.
human_access
%strong
=
member
.
human_access
-
if
show_controls
-
if
show_controls
-
if
can?
(
current_user
,
:modify
,
member
)
-
if
can?
(
current_user
,
:modify
,
member
)
=
link_to
'#'
,
class:
"btn-tiny btn js-toggle-button"
,
title:
'Edit access level'
do
=
button_tag
class:
"btn-tiny btn js-toggle-button"
,
title:
'Edit access level'
,
type:
'button'
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
-
if
can?
(
current_user
,
:destroy
,
member
)
-
if
can?
(
current_user
,
:destroy
,
member
)
-
if
current_user
==
member
.
user
-
if
current_user
==
member
.
user
...
...
app/views/groups/members.html.haml
View file @
55d98090
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
-
if
current_user
&&
current_user
.
can?
(
:manage_group
,
@group
)
-
if
current_user
&&
current_user
.
can?
(
:manage_group
,
@group
)
.pull-right
.pull-right
=
link_to
'#'
,
class:
'btn btn-new js-toggle-
button'
do
=
button_tag
class:
'btn btn-new js-toggle-button'
,
type:
'
button'
do
Add members
Add members
%i
.fa.fa-chevron-down
%i
.fa.fa-chevron-down
...
...
app/views/projects/branches/index.html.haml
View file @
55d98090
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
New branch
New branch
.dropdown.inline
.dropdown.inline
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
%span
.light
sort:
-
if
@sort
.
present?
-
if
@sort
.
present?
=
@sort
.
humanize
=
@sort
.
humanize
...
...
app/views/search/_filter.html.haml
View file @
55d98090
.dropdown.inline
.dropdown.inline
%
a
.dropdown-toggle.btn.btn-small
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn.btn-small
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%i
.fa.fa-tags
%i
.fa.fa-tags
%span
.light
Group:
%span
.light
Group:
-
if
@group
.
present?
-
if
@group
.
present?
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
group
.
name
=
group
.
name
.dropdown.inline.prepend-left-10.project-filter
.dropdown.inline.prepend-left-10.project-filter
%
a
.dropdown-toggle.btn.btn-small
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn.btn-small
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%i
.fa.fa-tags
%i
.fa.fa-tags
%span
.light
Project:
%span
.light
Project:
-
if
@project
.
present?
-
if
@project
.
present?
...
...
app/views/shared/_issuable_filter.html.haml
View file @
55d98090
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
All
All
.dropdown.inline.assignee-filter
.dropdown.inline.assignee-filter
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%i
.fa.fa-user
%i
.fa.fa-user
%span
.light
assignee:
%span
.light
assignee:
-
if
@assignee
.
present?
-
if
@assignee
.
present?
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
=
user
.
name
=
user
.
name
.dropdown.inline.prepend-left-10.author-filter
.dropdown.inline.prepend-left-10.author-filter
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%i
.fa.fa-user
%i
.fa.fa-user
%span
.light
author:
%span
.light
author:
-
if
@author
.
present?
-
if
@author
.
present?
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
=
user
.
name
=
user
.
name
.dropdown.inline.prepend-left-10.milestone-filter
.dropdown.inline.prepend-left-10.milestone-filter
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%i
.fa.fa-clock-o
%i
.fa.fa-clock-o
%span
.light
milestone:
%span
.light
milestone:
-
if
@milestone
.
present?
-
if
@milestone
.
present?
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
-
if
@project
-
if
@project
.dropdown.inline.prepend-left-10.labels-filter
.dropdown.inline.prepend-left-10.labels-filter
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%i
.fa.fa-tags
%i
.fa.fa-tags
%span
.light
label:
%span
.light
label:
-
if
params
[
:label_name
].
present?
-
if
params
[
:label_name
].
present?
...
...
app/views/shared/_sort_dropdown.html.haml
View file @
55d98090
.dropdown.inline.prepend-left-10
.dropdown.inline.prepend-left-10
%
a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%
button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
%span
.light
sort:
-
if
@sort
.
present?
-
if
@sort
.
present?
=
@sort
=
@sort
...
...
features/steps/groups.rb
View file @
55d98090
...
@@ -29,7 +29,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -29,7 +29,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step
'I select user "Mary Jane" from list with role "Reporter"'
do
step
'I select user "Mary Jane" from list with role "Reporter"'
do
user
=
User
.
find_by
(
name:
"Mary Jane"
)
||
create
(
:user
,
name:
"Mary Jane"
)
user
=
User
.
find_by
(
name:
"Mary Jane"
)
||
create
(
:user
,
name:
"Mary Jane"
)
click_
link
'Add members'
click_
button
'Add members'
within
".users-group-form"
do
within
".users-group-form"
do
select2
(
user
.
id
,
from:
"#user_ids"
,
multiple:
true
)
select2
(
user
.
id
,
from:
"#user_ids"
,
multiple:
true
)
select
"Reporter"
,
from:
"access_level"
select
"Reporter"
,
from:
"access_level"
...
...
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