diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-02 19:28:10 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-02 19:28:10 +0000 |
| commit | e7251c145caa367ab26700bd63b36c225fb80ef0 (patch) | |
| tree | 72e7f8bd9b3a62bf8d9b15b2abf871bfefe1ec97 | |
| parent | 920a83bee450e748ad4877cee6593ded2cb18b6c (diff) | |
| parent | 48a053f334f289ab5283fed9c000594c16fbd27f (diff) | |
| download | gitlab-ce-e7251c145caa367ab26700bd63b36c225fb80ef0.tar.gz | |
Merge branch '27321-double-separator-line-in-edit-projects-settings' into 'master'
Resolve "Double separator line in Edit projects settings"
Closes #27321
See merge request !8917
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index ec944d4ffb7..4a0ce995165 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -185,8 +185,8 @@ %li Container registry images %li CI variables %li Any encrypted tokens - %hr - if can? current_user, :archive_project, @project + %hr .row.prepend-top-default .col-lg-3 %h4.warning-title.prepend-top-0 diff --git a/changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml b/changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml new file mode 100644 index 00000000000..502927cd160 --- /dev/null +++ b/changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml @@ -0,0 +1,4 @@ +--- +title: Only render hr when user can't archive project. +merge_request: !8917 +author: |