diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index ebab7e45a64..920d7f9bf9c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -c6ba78e87bed03254417fe4cd52d377d88ac0b60 +0926b9f8ff2215874eef0e22f750a74da5fe4321 diff --git a/Gemfile b/Gemfile index 04e78f33d22..e4ddff2a803 100644 --- a/Gemfile +++ b/Gemfile @@ -372,7 +372,7 @@ group :development, :test do gem 'gitlab-styles', '~> 5.0.0', require: false - gem 'scss_lint', '~> 0.56.0', require: false + gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.6.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3b26093b11d..271c1950ca1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1081,9 +1081,8 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - scss_lint (0.56.0) - rake (>= 0.9, < 13) - sass (~> 3.5.3) + scss_lint (0.59.0) + sass (~> 3.5, >= 3.5.5) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1484,7 +1483,7 @@ DEPENDENCIES rugged (~> 0.28) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) - scss_lint (~> 0.56.0) + scss_lint (~> 0.59.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) sentry-raven (~> 3.0) diff --git a/app/assets/javascripts/repository/components/preview/index.vue b/app/assets/javascripts/repository/components/preview/index.vue index 4e2c8332f37..c9c5aa37645 100644 --- a/app/assets/javascripts/repository/components/preview/index.vue +++ b/app/assets/javascripts/repository/components/preview/index.vue @@ -58,7 +58,7 @@ export default { -
+
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index e12682b0a49..1d591168a17 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -1,6 +1,7 @@