summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-06 18:39:53 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-06 18:39:53 +0000
commit9de635bd953518c19ceb18bb2156e26ba9e73924 (patch)
treec7fc5877230e6ca062c421983c8c2b91584215d0 /app/views
parentd035bdbe3c9aff1b139ed656a5c4507475820e9d (diff)
parentfb63796ed9b5062431ee40faf9c7652964b48112 (diff)
downloadgitlab-ce-9de635bd953518c19ceb18bb2156e26ba9e73924.tar.gz
Merge branch '39757-border-zero-of-scss-lint' into 'master'
Enable BorderZero rule in scss-lint Closes #39757 See merge request gitlab-org/gitlab-ce!15168
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/background_jobs/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index 3ef8f2a3acb..f0cc4d7ee62 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -42,4 +42,4 @@
.panel.panel-default
- %iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: none" }
+ %iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: 0" }