summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-01-08 08:47:31 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-01-08 08:50:47 +0900
commita8a37764e277ecc88ae4f748dac50eb6cf744443 (patch)
treeeeac2f3b2b1a4c2c212da442e9b3dbbc383f7ba5
parent2c66b942bde756554b22d8b54c586fe45f544b0e (diff)
downloadgitlab-ce-a8a37764e277ecc88ae4f748dac50eb6cf744443.tar.gz
Update scss-lint to 0.56.0
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock15
-rw-r--r--changelogs/unreleased/41754-update-scss-lint-to-0-56-0.yml5
3 files changed, 17 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 38381d34b6b..4c4a61bb4e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -339,7 +339,7 @@ group :development, :test do
gem 'rubocop', '~> 0.52.0'
gem 'rubocop-rspec', '~> 1.20.1'
- gem 'scss_lint', '~> 0.54.0', require: false
+ gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.26.0', require: false
gem 'simplecov', '~> 0.14.0', require: false
gem 'flay', '~> 2.8.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a81c81b0f8..c854cda48ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -695,6 +695,9 @@ GEM
rake
raindrops (0.18.0)
rake (12.3.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rbnacl (4.0.2)
@@ -809,7 +812,11 @@ GEM
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- sass (3.4.22)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
@@ -819,9 +826,9 @@ GEM
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
- scss_lint (0.54.0)
+ scss_lint (0.56.0)
rake (>= 0.9, < 13)
- sass (~> 3.4.20)
+ sass (~> 3.5.3)
securecompare (1.0.0)
seed-fu (2.3.6)
activerecord (>= 3.1)
@@ -1162,7 +1169,7 @@ DEPENDENCIES
rugged (~> 0.26.0)
sanitize (~> 2.0)
sass-rails (~> 5.0.6)
- scss_lint (~> 0.54.0)
+ scss_lint (~> 0.56.0)
seed-fu (= 2.3.6)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.5)
diff --git a/changelogs/unreleased/41754-update-scss-lint-to-0-56-0.yml b/changelogs/unreleased/41754-update-scss-lint-to-0-56-0.yml
new file mode 100644
index 00000000000..b96dd376cec
--- /dev/null
+++ b/changelogs/unreleased/41754-update-scss-lint-to-0-56-0.yml
@@ -0,0 +1,5 @@
+---
+title: Update scss-lint to 0.56.0
+merge_request: 16278
+author: Takuya Noguchi
+type: other