diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2016-12-23 12:23:04 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-03 10:52:14 -0600 |
| commit | 68c730bb99a12b0ea8ac3d08f074dc66e7ac2dae (patch) | |
| tree | d2d55167efd490860767887afec1f6060e2ccf51 /app/views/projects/project_members | |
| parent | 4cd139e948ad0de3516b6534146b51faffeca610 (diff) | |
| download | gitlab-ce-68c730bb99a12b0ea8ac3d08f074dc66e7ac2dae.tar.gz | |
Fixed rspec tests for the project members also fixed the index
view (removed an extra tag )
Diffstat (limited to 'app/views/projects/project_members')
| -rw-r--r-- | app/views/projects/project_members/_index.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/project_members/_new_project_member.html.haml | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml index 6499569dde7..0208e6e4ae8 100644 --- a/app/views/projects/project_members/_index.html.haml +++ b/app/views/projects/project_members/_index.html.haml @@ -17,11 +17,7 @@ %h5.member.existing-title Existing users and groups - if @group_links.any? - = render 'groups', group_links: @group_links - - .append-bottom-default.clearfix - - if @group_links.any? - = render 'groups', group_links: @group_links + = render 'projects/project_members/groups', group_links: @group_links = render 'projects/project_members/team', members: @project_members = paginate @project_members, theme: "gitlab" diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml index ca08b58873b..e922b56d3bc 100644 --- a/app/views/projects/project_members/_new_project_member.html.haml +++ b/app/views/projects/project_members/_new_project_member.html.haml @@ -1,4 +1,4 @@ -= form_for @project_member, as: :project_member, url: namespace_project_settings_members_path(@project.namespace, @project), html: { class: 'users-project-form' } do |f| += form_for @project_member, as: :project_member, url: namespace_project_project_members_path(@project.namespace, @project), html: { class: 'users-project-form' } do |f| .row .col-md-5.col-lg-5 = users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true) |