Commit a56216c8 authored by Phil Hughes's avatar Phil Hughes

Added import button back in

parent 999f1848
- 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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment