From a56216c8bd1ef82c09c7ce39596e4b6436ebb7fa Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 14:06:20 +0100
Subject: [PATCH] Added import button back in
---
app/views/projects/project_members/index.html.haml | 4 ++--
features/steps/project/team_management.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index abe10433387..d289d75454d 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -1,15 +1,15 @@
- page_title "Members"
.project-members-page.js-project-members-page.prepend-top-default
- %h4
+ %h4.clearfix
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
- if can?(current_user, :admin_project_member, @project)
.project-members-new.append-bottom-default
%h5.clearfix
Add new user to
%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 'shared/members/requests', membership_source: @project, requesters: @requesters
diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb
index 49821b85922..b21d0849ad1 100644
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
@@ -110,7 +110,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
end
step 'I click link "Import team from another project"' do
- click_link "Import members from another project"
+ click_link "Import"
end
When 'I submit "Website" project for import team' do
--
GitLab