diff --git a/Gemfile b/Gemfile index 354bd89b8..a40e59d5c 100644 --- a/Gemfile +++ b/Gemfile @@ -56,6 +56,7 @@ group :development, :test do gem 'spring' gem 'spring-commands-rspec' gem 'konacha' + gem 'sprockets-rails', '< 3.0.0' # Compatibility issue with Konacha 3.7.0 gem 'guard-konacha-rails' gem 'poltergeist', require: 'capybara/poltergeist' gem 'selenium-webdriver' diff --git a/Gemfile.lock b/Gemfile.lock index bc7518eaa..b4c9eeecf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,7 +51,7 @@ GEM rake (~> 10.4) arel (6.0.3) arrayfields (4.9.2) - ast (2.1.0) + ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) autoprefixer-rails (6.1.1) @@ -109,9 +109,9 @@ GEM codeclimate-test-reporter (0.4.8) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs @@ -252,7 +252,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (2.9.2) netrc (0.11.0) - nokogiri (1.6.7) + nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) notiffany (0.0.8) nenv (~> 0.1) @@ -523,6 +523,7 @@ DEPENDENCIES simplecov spring spring-commands-rspec + sprockets-rails (< 3.0.0) sqlite3 state_machine (= 1.2.0) terminal-notifier-guard diff --git a/vendor/cache/ast-2.1.0.gem b/vendor/cache/ast-2.1.0.gem deleted file mode 100644 index 594a52df2..000000000 Binary files a/vendor/cache/ast-2.1.0.gem and /dev/null differ diff --git a/vendor/cache/ast-2.2.0.gem b/vendor/cache/ast-2.2.0.gem new file mode 100644 index 000000000..d5794298f Binary files /dev/null and b/vendor/cache/ast-2.2.0.gem differ diff --git a/vendor/cache/coffee-rails-4.1.0.gem b/vendor/cache/coffee-rails-4.1.0.gem deleted file mode 100644 index 74775880a..000000000 Binary files a/vendor/cache/coffee-rails-4.1.0.gem and /dev/null differ diff --git a/vendor/cache/coffee-rails-4.1.1.gem b/vendor/cache/coffee-rails-4.1.1.gem new file mode 100644 index 000000000..726e8baa3 Binary files /dev/null and b/vendor/cache/coffee-rails-4.1.1.gem differ diff --git a/vendor/cache/nokogiri-1.6.7.gem b/vendor/cache/nokogiri-1.6.7.1.gem similarity index 72% rename from vendor/cache/nokogiri-1.6.7.gem rename to vendor/cache/nokogiri-1.6.7.1.gem index 84870acee..d66d59703 100644 Binary files a/vendor/cache/nokogiri-1.6.7.gem and b/vendor/cache/nokogiri-1.6.7.1.gem differ