summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2017-07-05 12:17:02 -0700
committertauriedavis <taurie@gitlab.com>2017-07-05 15:58:39 -0700
commit24f360a7241e6bbd872f70af2ed30c4c3ccc90b2 (patch)
treef520862e1126bd23c3a981bb6cd4d6d7c228b6c6
parent6c15905c3bd11209858eac8870ffa9211f08f157 (diff)
downloadgitlab-ce-34727-simplified-member-settings.tar.gz
34727 Remove two columned layout from project member settings34727-simplified-member-settings
-rw-r--r--app/views/projects/project_members/_index.html.haml5
-rw-r--r--changelogs/unreleased/34727-simplified-member-settings.yml4
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml
index fa99610c0be..08e2d6177ab 100644
--- a/app/views/projects/project_members/_index.html.haml
+++ b/app/views/projects/project_members/_index.html.haml
@@ -1,6 +1,6 @@
.row.prepend-top-default
- .col-lg-4.settings-sidebar
- %h4.prepend-top-0
+ .col-lg-12
+ %h4
Project members
- if can?(current_user, :admin_project_member, @project)
%p
@@ -13,7 +13,6 @@
%i Masters
or
%i Owners
- .col-lg-8
.light
- if can?(current_user, :admin_project_member, @project)
%ul.nav-links.project-member-tabs{ role: 'tablist' }
diff --git a/changelogs/unreleased/34727-simplified-member-settings.yml b/changelogs/unreleased/34727-simplified-member-settings.yml
new file mode 100644
index 00000000000..8c4844c001b
--- /dev/null
+++ b/changelogs/unreleased/34727-simplified-member-settings.yml
@@ -0,0 +1,4 @@
+---
+title: Remove two columned layout from project member settings
+merge_request:
+author: