summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-12-18 14:27:58 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-12-18 14:33:48 -0700
commit47eaadec8255143832b2a7109f73cddf33cb0eb7 (patch)
tree60ddc1fb5944a395067d3f97a475d9075cbbe6c5
parent322643e7407261dede00b5514ac2721e922436f7 (diff)
downloadgitlab-ce-47eaadec8255143832b2a7109f73cddf33cb0eb7.tar.gz
Fix formatting
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss22
-rw-r--r--app/controllers/concerns/with_performance_bar.rb2
2 files changed, 12 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 2dfaa0892b3..7e803dfa8eb 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -74,7 +74,7 @@
}
.md-header-tab {
- @media(max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
flex: 1;
width: 100%;
border-bottom: 1px solid $border-color;
@@ -89,15 +89,15 @@
&.active {
display: block;
- }
- @media(max-width: $screen-xs-max) {
- flex: none;
- display: flex;
- justify-content: center;
- width: 100%;
- padding-top: $gl-padding-top;
- padding-bottom: $gl-padding-top;
+ @media (max-width: $screen-xs-max) {
+ flex: none;
+ display: flex;
+ justify-content: center;
+ width: 100%;
+ padding-top: $gl-padding-top;
+ padding-bottom: $gl-padding-top;
+ }
}
}
}
@@ -183,7 +183,7 @@
margin-left: $gl-padding;
margin-right: -5px;
- @media(max-width: $screen-xs-max) {
+ @media (max-width: $screen-xs-max) {
margin-left: 0;
margin-right: 0;
}
@@ -247,7 +247,7 @@
}
}
-@media(max-width: $screen-xs-max) {
+@media (max-width: $screen-xs-max) {
.atwho-view-ul {
width: 350px;
}
diff --git a/app/controllers/concerns/with_performance_bar.rb b/app/controllers/concerns/with_performance_bar.rb
index a1848286b2b..230bbe4b1aa 100644
--- a/app/controllers/concerns/with_performance_bar.rb
+++ b/app/controllers/concerns/with_performance_bar.rb
@@ -6,7 +6,7 @@ module WithPerformanceBar
end
def peek_enabled?
- # return true if Rails.env.development?
+ return true if Rails.env.development?
return false unless Gitlab::PerformanceBar.enabled?(current_user)
if RequestStore.active?