Commit f34bd452 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Fixed test failures on the group_management.feature for spinach

parent 5992e915
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%strong= @project.name %strong= @project.name
.col-lg-9 .col-lg-9
.light.prepend-top-default .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 "projects/project_members/new_project_member"
= render 'shared/members/requests', membership_source: @project, requesters: @requesters = render 'shared/members/requests', membership_source: @project, requesters: @requesters
......
...@@ -15,4 +15,5 @@ ...@@ -15,4 +15,5 @@
.help-block.append-bottom-10 .help-block.append-bottom-10
On this date, the member(s) will automatically lose access to this project. On this date, the member(s) will automatically lose access to this project.
= f.submit "Add to project", class: "btn btn-create" = 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" = link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default", title: "Import members from another project"
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