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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f34bd452
Commit
f34bd452
authored
Jan 09, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed test failures on the group_management.feature for spinach
parent
5992e915
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/views/projects/project_members/_index.html.haml
app/views/projects/project_members/_index.html.haml
+1
-1
app/views/projects/project_members/_new_project_member.html.haml
...ws/projects/project_members/_new_project_member.html.haml
+2
-1
No files found.
app/views/projects/project_members/_index.html.haml
View file @
f34bd452
...
...
@@ -8,7 +8,7 @@
%strong
=
@project
.
name
.col-lg-9
.light.prepend-top-default
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
&&
!
membership_locked?
=
render
"projects/project_members/new_project_member"
=
render
'shared/members/requests'
,
membership_source:
@project
,
requesters:
@requesters
...
...
app/views/projects/project_members/_new_project_member.html.haml
View file @
f34bd452
...
...
@@ -15,4 +15,5 @@
.help-block.append-bottom-10
On this date, the member(s) will automatically lose access to this project.
=
f
.
submit
"Add to project"
,
class:
"btn btn-create"
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
&&
!
membership_locked?
=
link_to
"Import"
,
import_namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-default"
,
title:
"Import members from another project"
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