diff --git a/Gemfile b/Gemfile index 45265fae..d4b9652e 100644 --- a/Gemfile +++ b/Gemfile @@ -62,8 +62,8 @@ gem 'react-rails', '~> 2.7', '>= 2.7.1' gem "letter_opener", :group => :development -gem 'sass-rails', "~> 4.0.5" -gem 'compass-rails', "~> 1.0.3" +gem 'sass-rails', '~> 5.0', '>= 5.0.7' +gem 'compass-rails', '~> 3.1' gem 'uglifier', ">= 1.0.3" # Backfills for old Rails behaviors diff --git a/Gemfile.lock b/Gemfile.lock index 93cd1f65..74217dc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,13 +68,23 @@ GEM ssrf_filter (~> 1.0, < 1.1.0) character-encodings (0.4.1) chronic (0.6.7) - chunky_png (1.3.4) - compass (0.12.7) + chunky_png (1.4.0) + compass (1.0.3) chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.2.19) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + compass-core (~> 1.0.2) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.3) + multi_json (~> 1.0) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) + compass-rails (3.1.0) + compass (~> 1.0.0) + sass-rails (< 5.1) + sprockets (< 4.0) concurrent-ruby (1.1.10) connection_pool (2.2.5) devise (3.5.10) @@ -97,6 +107,7 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) + ffi (1.12.2) fog (1.8.0) builder excon (~> 0.14) @@ -108,7 +119,6 @@ GEM nokogiri (~> 1.5.0) ruby-hmac formatador (0.2.5) - fssm (0.2.10) globalize (4.0.3) activemodel (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) @@ -177,6 +187,9 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) rdiscount (1.6.8) react-rails (2.7.1) babel-transpiler (>= 0.7.0) @@ -224,12 +237,13 @@ GEM capistrano (~> 2.15.4) sanitize (2.0.6) nokogiri (>= 1.4.4) - sass (3.2.19) - sass-rails (4.0.5) - railties (>= 4.0.0, < 5.0) - sass (~> 3.2.2) - sprockets (~> 2.8, < 3.0) - sprockets-rails (~> 2.0) + sass (3.4.25) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) @@ -273,7 +287,7 @@ DEPENDENCIES capistrano (~> 2.15.5) carrierwave (~> 1.3, >= 1.3.3) character-encodings (~> 0.4.1) - compass-rails (~> 1.0.3) + compass-rails (~> 3.1) devise (~> 3.5.10) dotenv-deployment dotenv-rails @@ -307,7 +321,7 @@ DEPENDENCIES rspec-rails (~> 2.0.0.beta.22) rvm-capistrano (~> 1.5.6) sanitize (~> 2.0.3) - sass-rails (~> 4.0.5) + sass-rails (~> 5.0, >= 5.0.7) swf_converter (~> 0.0.3) uglifier (>= 1.0.3) whenever (~> 0.7.3) diff --git a/vendor/cache/chunky_png-1.3.4.gem b/vendor/cache/chunky_png-1.3.4.gem deleted file mode 100644 index a0183676..00000000 Binary files a/vendor/cache/chunky_png-1.3.4.gem and /dev/null differ diff --git a/vendor/cache/chunky_png-1.4.0.gem b/vendor/cache/chunky_png-1.4.0.gem new file mode 100644 index 00000000..f7cc569a Binary files /dev/null and b/vendor/cache/chunky_png-1.4.0.gem differ diff --git a/vendor/cache/compass-0.12.7.gem b/vendor/cache/compass-0.12.7.gem deleted file mode 100644 index 5205dbf3..00000000 Binary files a/vendor/cache/compass-0.12.7.gem and /dev/null differ diff --git a/vendor/cache/compass-1.0.3.gem b/vendor/cache/compass-1.0.3.gem new file mode 100644 index 00000000..045352a9 Binary files /dev/null and b/vendor/cache/compass-1.0.3.gem differ diff --git a/vendor/cache/compass-core-1.0.3.gem b/vendor/cache/compass-core-1.0.3.gem new file mode 100644 index 00000000..339d9c27 Binary files /dev/null and b/vendor/cache/compass-core-1.0.3.gem differ diff --git a/vendor/cache/compass-import-once-1.0.5.gem b/vendor/cache/compass-import-once-1.0.5.gem new file mode 100644 index 00000000..f6bb3322 Binary files /dev/null and b/vendor/cache/compass-import-once-1.0.5.gem differ diff --git a/vendor/cache/compass-rails-1.0.3.gem b/vendor/cache/compass-rails-1.0.3.gem deleted file mode 100644 index b7d51174..00000000 Binary files a/vendor/cache/compass-rails-1.0.3.gem and /dev/null differ diff --git a/vendor/cache/compass-rails-3.1.0.gem b/vendor/cache/compass-rails-3.1.0.gem new file mode 100644 index 00000000..72e05504 Binary files /dev/null and b/vendor/cache/compass-rails-3.1.0.gem differ diff --git a/vendor/cache/ffi-1.12.2.gem b/vendor/cache/ffi-1.12.2.gem new file mode 100644 index 00000000..e596b5d3 Binary files /dev/null and b/vendor/cache/ffi-1.12.2.gem differ diff --git a/vendor/cache/fssm-0.2.10.gem b/vendor/cache/fssm-0.2.10.gem deleted file mode 100644 index cf6dc097..00000000 Binary files a/vendor/cache/fssm-0.2.10.gem and /dev/null differ diff --git a/vendor/cache/rb-fsevent-0.11.2.gem b/vendor/cache/rb-fsevent-0.11.2.gem new file mode 100644 index 00000000..e6452663 Binary files /dev/null and b/vendor/cache/rb-fsevent-0.11.2.gem differ diff --git a/vendor/cache/rb-inotify-0.10.1.gem b/vendor/cache/rb-inotify-0.10.1.gem new file mode 100644 index 00000000..276590b7 Binary files /dev/null and b/vendor/cache/rb-inotify-0.10.1.gem differ diff --git a/vendor/cache/sass-3.2.19.gem b/vendor/cache/sass-3.2.19.gem deleted file mode 100644 index fe0af43d..00000000 Binary files a/vendor/cache/sass-3.2.19.gem and /dev/null differ diff --git a/vendor/cache/sass-3.4.25.gem b/vendor/cache/sass-3.4.25.gem new file mode 100644 index 00000000..9eeb0bc6 Binary files /dev/null and b/vendor/cache/sass-3.4.25.gem differ diff --git a/vendor/cache/sass-rails-4.0.5.gem b/vendor/cache/sass-rails-4.0.5.gem deleted file mode 100644 index 62f962ea..00000000 Binary files a/vendor/cache/sass-rails-4.0.5.gem and /dev/null differ diff --git a/vendor/cache/sass-rails-5.0.7.gem b/vendor/cache/sass-rails-5.0.7.gem new file mode 100644 index 00000000..7363b9e9 Binary files /dev/null and b/vendor/cache/sass-rails-5.0.7.gem differ