diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-07-06 17:21:35 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-07-06 17:21:35 +0000 |
| commit | b3b14f6bd049699491b78608a54b4acd41979974 (patch) | |
| tree | b251675356e03686c57f7a12b7aeaad90a99acbf | |
| parent | 86e8c4f7ed80a955982bd56e692e2a4f6b477c9c (diff) | |
| parent | 53bd34bb84d0e703386e41864dec134ceeedd523 (diff) | |
| download | gitlab-ce-b3b14f6bd049699491b78608a54b4acd41979974.tar.gz | |
Merge branch '34727-simplified-member-settings' into 'master'
34727 Remove two columned layout from project member settings
Closes #34727
See merge request !12663
| -rw-r--r-- | app/views/projects/project_members/_index.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/34727-simplified-member-settings.yml | 4 |
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: |