summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-02-01 15:55:55 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-02 13:19:33 -0600
commit48a053f334f289ab5283fed9c000594c16fbd27f (patch)
tree63d8c995574cdf3a8ab58ea7e7246cef6d16bff1
parente3a5f1df29ca09797217d90af4ce0086a66fcd8d (diff)
downloadgitlab-ce-48a053f334f289ab5283fed9c000594c16fbd27f.tar.gz
Only render hr when user can't archive project.
-rw-r--r--app/views/projects/edit.html.haml2
-rw-r--r--changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml4
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: