summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-04-11 17:58:53 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-04-11 17:58:53 +0000
commit9f8d91c94e6ad41c970931d5eab6948fad31187b (patch)
treec192056d3f4a5bb529d9e692658ed4e43026b5ec /app/views
parent8206cae781f4b69fc165638d8cc964d92df70740 (diff)
parented1fea06fb72161dd183e7708f6aba58dfcf7d52 (diff)
downloadgitlab-ce-9f8d91c94e6ad41c970931d5eab6948fad31187b.tar.gz
Merge branch 'winh-protection-push-dropdowns-backport' into 'master'
Limit dropdown toggle width for protected branches / tags See merge request gitlab-org/gitlab-ce!18212
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/protected_branches/shared/_branches_list.html.haml2
-rw-r--r--app/views/projects/protected_tags/shared/_tags_list.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/protected_branches/shared/_branches_list.html.haml b/app/views/projects/protected_branches/shared/_branches_list.html.haml
index a09c13176c3..300055a4207 100644
--- a/app/views/projects/protected_branches/shared/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/shared/_branches_list.html.haml
@@ -1,4 +1,4 @@
-.panel.panel-default.protected-branches-list.js-protected-branches-list
+.protected-branches-list.js-protected-branches-list
- if @protected_branches.empty?
.panel-heading
%h3.panel-title
diff --git a/app/views/projects/protected_tags/shared/_tags_list.html.haml b/app/views/projects/protected_tags/shared/_tags_list.html.haml
index 02908e16dc5..3ed82e51dbe 100644
--- a/app/views/projects/protected_tags/shared/_tags_list.html.haml
+++ b/app/views/projects/protected_tags/shared/_tags_list.html.haml
@@ -1,4 +1,4 @@
-.panel.panel-default.protected-tags-list.js-protected-tags-list
+.protected-tags-list.js-protected-tags-list
- if @protected_tags.empty?
.panel-heading
%h3.panel-title