From 239248c2ad40b50a937af012671f74ca8ad351fe Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sat, 15 Aug 2015 19:57:13 +0100 Subject: [PATCH] Intital dependency updates to accomodate rails 4 --- Gemfile | 8 ++- Gemfile.lock | 141 +++++++++++++++++++++++---------------------------- 2 files changed, 66 insertions(+), 83 deletions(-) diff --git a/Gemfile b/Gemfile index 8bfe310..87eeeb7 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' ruby '2.2.2' gem 'dotenv-rails', '~> 0.10.0' -gem 'rails', '~> 3.2.22' +gem 'rails', '~> 4.0.13' gem 'mysql2', '~> 0.3.15' gem 'dalli', '~> 2.7.0' gem 'puma', '~> 2.11.1' @@ -28,12 +28,10 @@ gem 'test-unit', '~> 3.1.3' # Please install nodejs locally. gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux' -gem 'sprockets', '~> 2.2.1' -gem 'coffee-rails', '~> 3.2.2' +gem 'coffee-rails', '~> 4.0.0' gem 'jquery-rails', '~> 2.0.2' gem 'tinymce-rails', '~> 3.5.9' -gem 'sass', '~> 3.3.4' -gem 'sass-rails', '~> 3.2.6' +gem 'sass-rails', '~> 5.0.3' gem 'font-awesome-sass', '~> 4.1.0.0' gem 'bourbon', '~> 3.1.8' diff --git a/Gemfile.lock b/Gemfile.lock index 99f2468..530d8be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,39 +9,36 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.22) - actionpack (= 3.2.22) - mail (~> 2.5.4) - actionpack (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - builder (~> 3.0.0) + actionmailer (4.0.13) + actionpack (= 4.0.13) + mail (~> 2.5, >= 2.5.4) + actionpack (4.0.13) + activesupport (= 4.0.13) + builder (~> 3.1.0) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) active_link_to (1.0.2) actionpack - activemodel (3.2.22) - activesupport (= 3.2.22) - builder (~> 3.0.0) - activerecord (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - activesupport (3.2.22) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + activemodel (4.0.13) + activesupport (= 4.0.13) + builder (~> 3.1.0) + activerecord (4.0.13) + activemodel (= 4.0.13) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.13) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.4) + activesupport (4.0.13) + i18n (~> 0.6, >= 0.6.9) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) annotate (2.6.3) activerecord (>= 2.3.0) rake (>= 0.8.7) - arel (3.0.3) + arel (4.0.2) bbcoder (1.0.1) better_errors (1.1.0) coderay (>= 1.0.0) @@ -52,7 +49,7 @@ GEM bourbon (3.1.8) sass (>= 3.2.0) thor - builder (3.0.4) + builder (3.1.4) byebug (2.7.0) columnize (~> 0.3) debugger-linecache (~> 1.2) @@ -86,13 +83,13 @@ GEM codeclimate-test-reporter (0.3.0) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) - coffee-rails (3.2.2) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) - coffee-script (2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.9.1.1) columnize (0.8.9) country_code_select (1.0.1) activesupport (>= 3.0) @@ -108,7 +105,7 @@ GEM erubis (2.7.0) exceptional (2.0.33) rack - execjs (2.0.2) + execjs (2.6.0) factory_girl (4.4.0) activesupport (>= 3.0.0) factory_girl_rails (4.4.1) @@ -121,19 +118,17 @@ GEM sass (~> 3.2) haml (4.0.5) tilt - hike (1.2.3) i18n (0.7.0) - journey (1.0.4) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.8.3) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + mail (2.6.3) + mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.6.1) mini_portile (0.6.2) + minitest (4.7.5) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -153,7 +148,6 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.5) power_assert (0.2.4) pry (0.9.12.6) coderay (~> 1.0) @@ -166,33 +160,25 @@ GEM rack (>= 1.1, < 2.0) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.4.7) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.4) - rack + rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (3.2.22) - actionmailer (= 3.2.22) - actionpack (= 3.2.22) - activerecord (= 3.2.22) - activeresource (= 3.2.22) - activesupport (= 3.2.22) - bundler (~> 1.0) - railties (= 3.2.22) + rails (4.0.13) + actionmailer (= 4.0.13) + actionpack (= 4.0.13) + activerecord (= 4.0.13) + activesupport (= 4.0.13) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.13) + sprockets-rails (~> 2.0) rails_autolink (1.1.5) rails (> 3.1) - railties (3.2.22) - actionpack (= 3.2.22) - activesupport (= 3.2.22) - rack-ssl (~> 1.3.2) + railties (4.0.13) + actionpack (= 4.0.13) + activesupport (= 4.0.13) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) + thor (>= 0.18.1, < 2.0) rake (10.4.2) - rdoc (3.12.2) - json (~> 1.4) rmagick (2.13.4) rspec-core (3.3.2) rspec-support (~> 3.3.0) @@ -214,11 +200,13 @@ GEM rubyzip (1.1.3) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.3.7) - sass-rails (3.2.6) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) + sass (3.4.16) + sass-rails (5.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (~> 1.1) selenium-webdriver (2.41.0) childprocess (>= 0.5.0) multi_json (~> 1.0) @@ -229,11 +217,12 @@ GEM simplecov-html (~> 0.7.1) simplecov-html (0.7.1) slop (3.5.0) - sprockets (2.2.3) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.3.1) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.3.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) sshkit (1.4.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) @@ -243,14 +232,12 @@ GEM test-unit (3.1.3) power_assert thor (0.19.1) + thread_safe (0.3.5) tilt (1.4.1) timecop (0.7.1) tins (1.1.0) tinymce-rails (3.5.9) railties (>= 3.1.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) tzinfo (0.3.44) uglifier (2.5.0) execjs (>= 0.3.0) @@ -281,7 +268,7 @@ DEPENDENCIES capybara (~> 2.4.4) carrierwave (~> 0.10.0) codeclimate-test-reporter (~> 0.3.0) - coffee-rails (~> 3.2.2) + coffee-rails (~> 4.0.0) country_code_select (~> 1.0.1) dalli (~> 2.7.0) database_cleaner (~> 1.2.0) @@ -302,16 +289,14 @@ DEPENDENCIES pry-byebug (~> 1.3.2) puma (~> 2.11.1) quiet_assets (~> 1.0.2) - rails (~> 3.2.22) + rails (~> 4.0.13) rails_autolink (~> 1.1.5) rmagick (~> 2.13.4) rspec-rails (~> 3.3.3) sanitize (~> 2.1.0) - sass (~> 3.3.4) - sass-rails (~> 3.2.6) + sass-rails (~> 5.0.3) selenium-webdriver (~> 2.41.0) simplecov (~> 0.7.1) - sprockets (~> 2.2.1) steam-condenser! test-unit (~> 3.1.3) timecop (~> 0.7.1)