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
Jérome Perrin
gitlab-ce
Commits
a56216c8
Commit
a56216c8
authored
Sep 02, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added import button back in
parent
999f1848
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/projects/project_members/index.html.haml
app/views/projects/project_members/index.html.haml
+2
-2
features/steps/project/team_management.rb
features/steps/project/team_management.rb
+1
-1
No files found.
app/views/projects/project_members/index.html.haml
View file @
a56216c8
-
page_title
"Members"
-
page_title
"Members"
.project-members-page.js-project-members-page.prepend-top-default
.project-members-page.js-project-members-page.prepend-top-default
%h4
%h4
.clearfix
Members
Members
=
link_to
"Import"
,
import_namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-default pull-right hidden-xs"
,
title:
"Import members from another project"
%hr
%hr
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
.project-members-new.append-bottom-default
.project-members-new.append-bottom-default
%h5
.clearfix
%h5
.clearfix
Add new user to
Add new user to
%strong
=
@project
.
name
%strong
=
@project
.
name
-# = link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default pull-right", title: "Import members from another project"
=
render
"new_project_member"
=
render
"new_project_member"
=
render
'shared/members/requests'
,
membership_source:
@project
,
requesters:
@requesters
=
render
'shared/members/requests'
,
membership_source:
@project
,
requesters:
@requesters
...
...
features/steps/project/team_management.rb
View file @
a56216c8
...
@@ -110,7 +110,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
...
@@ -110,7 +110,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
end
end
step
'I click link "Import team from another project"'
do
step
'I click link "Import team from another project"'
do
click_link
"Import
members from another project
"
click_link
"Import"
end
end
When
'I submit "Website" project for import team'
do
When
'I submit "Website" project for import team'
do
...
...
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