From 53bd34bb84d0e703386e41864dec134ceeedd523 Mon Sep 17 00:00:00 2001 From: tauriedavis Date: Wed, 5 Jul 2017 12:17:02 -0700 Subject: 34727 Remove two columned layout from project member settings --- app/views/projects/project_members/_index.html.haml | 5 ++--- changelogs/unreleased/34727-simplified-member-settings.yml | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/34727-simplified-member-settings.yml 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: -- cgit v1.2.1