From a771d7c0fb2b3b8ff2b0a7164946225429d75f1f Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 27 Dec 2014 23:48:12 +0100 Subject: [PATCH] Upgraded from Rails 4.0 to 4.2 --- Gemfile | 27 +++--- Gemfile.lock | 238 +++++++++++++++++++++++++++++---------------------- 2 files changed, 153 insertions(+), 112 deletions(-) diff --git a/Gemfile b/Gemfile index f9dbee8..633704b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,19 +1,19 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.0' +gem 'rails', '4.2.0' # Use sqlite3 as the database for Active Record # gem 'sqlite3' # Use SCSS for stylesheets -gem 'sass-rails', '~> 4.0.0' +gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views -gem 'coffee-rails', '~> 4.0.0' +gem 'coffee-rails', '~> 4.1.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby @@ -26,11 +26,11 @@ gem 'jquery-rails' #gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 1.2' +gem 'jbuilder', '~> 2.0' group :doc do # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', require: false + gem 'sdoc', '~> 0.4.0' end # Use ActiveModel has_secure_password @@ -53,14 +53,19 @@ group :development do gem "binding_of_caller" # Chrome Rails debugging app - gem 'meta_request' + #gem 'meta_request' end -# Twitter Bootstrap template -#gem 'bootstrap-sass' -#gem 'anjlab-bootstrap-rails', '>= 3.0.0.0' -# gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails', - # :github => 'anjlab/bootstrap-rails' +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug' + + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end # Zurb Foundation gem 'foundation-rails' diff --git a/Gemfile.lock b/Gemfile.lock index d60e30a..58f94ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,138 +1,172 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) + actionmailer (4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.0) + actionview (= 4.2.0) + activesupport (= 4.2.0) + rack (~> 1.6.0) rack-test (~> 0.6.2) - activemodel (4.0.0) - activesupport (= 4.0.0) - builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - arel (4.0.1) - atomic (1.1.14) - better_errors (1.0.1) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.0) + activesupport (= 4.2.0) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.0) + activesupport (= 4.2.0) + globalid (>= 0.3.0) + activemodel (4.2.0) + activesupport (= 4.2.0) + builder (~> 3.1) + activerecord (4.2.0) + activemodel (= 4.2.0) + activesupport (= 4.2.0) + arel (~> 6.0) + activesupport (4.2.0) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.0) + better_errors (2.1.0) coderay (>= 1.0.0) erubis (>= 2.6.6) + rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - builder (3.1.4) - callsite (0.0.11) + builder (3.2.2) + byebug (3.5.1) + columnize (~> 0.8) + debugger-linecache (~> 1.2) + slop (~> 3.6) coderay (1.1.0) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.8.0) + columnize (0.9.0) debug_inspector (0.0.2) + debugger-linecache (1.2.0) erubis (2.7.0) - execjs (2.0.2) - fancybox2-rails (0.2.5) + execjs (2.2.2) + fancybox2-rails (0.2.8) + railties (>= 3.1.0, < 5.0) + foundation-rails (5.5.0.0) railties (>= 3.1.0) - foundation-rails (5.4.5.0) - railties (>= 3.1.0) - sass (>= 3.2.0) + sass (>= 3.2.0, < 3.4) + globalid (0.3.0) + activesupport (>= 4.1.0) hike (1.2.3) - i18n (0.6.5) - jbuilder (1.5.2) - activesupport (>= 3.0.0) - multi_json (>= 1.2.0) - jquery-rails (3.0.4) - railties (>= 3.0, < 5.0) + i18n (0.7.0) + jbuilder (2.2.6) + activesupport (>= 3.0.0, < 5) + multi_json (~> 1.2) + jquery-rails (4.0.2) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.1) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - meta_request (0.2.8) - callsite - rack-contrib - railties - mime-types (1.25) - minitest (4.7.5) - multi_json (1.8.2) - pg (0.17.0) + loofah (2.0.1) + nokogiri (>= 1.5.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) + mime-types (2.4.3) + mini_portile (0.6.1) + minitest (5.5.0) + multi_json (1.10.1) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + pg (0.17.1) pg_search (0.7.8) activerecord (>= 3.1) activesupport (>= 3.1) arel - polyglot (0.3.3) - rack (1.5.2) - rack-contrib (1.1.0) - rack (>= 0.9.1) + rack (1.6.0) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) + rails (4.2.0) + actionmailer (= 4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + activemodel (= 4.2.0) + activerecord (= 4.2.0) + activesupport (= 4.2.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) - sprockets-rails (~> 2.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + railties (= 4.2.0) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.5) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.1) + loofah (~> 2.0) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) - rdoc (3.12.2) + rake (10.4.2) + rdoc (4.2.0) json (~> 1.4) - sass (3.2.12) - sass-rails (4.0.1) + sass (3.3.14) + sass-rails (5.0.0) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) - sprockets-rails (~> 2.0.0) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - slim (2.0.2) - temple (~> 0.6.6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (~> 1.1) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + slim (3.0.1) + temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) - slim-rails (2.0.3) - actionpack (>= 3.0, < 4.1) - activesupport (>= 3.0, < 4.1) - railties (>= 3.0, < 4.1) - slim (~> 2.0) - sprockets (2.10.0) + slim-rails (3.0.1) + actionmailer (>= 3.1, < 5.0) + actionpack (>= 3.1, < 5.0) + activesupport (>= 3.1, < 5.0) + railties (>= 3.1, < 5.0) + slim (~> 3.0) + slop (3.6.0) + spring (1.2.0) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.2.2) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) - temple (0.6.7) - thor (0.18.1) - thread_safe (0.1.3) - atomic + sprockets (>= 2.8, < 4.0) + temple (0.7.4) + thor (0.19.1) + thread_safe (0.3.4) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.38) - uglifier (2.3.1) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.6.0) execjs (>= 0.3.0) json (>= 1.8.0) + web-console (2.0.0) + activemodel (~> 4.0) + binding_of_caller (>= 0.7.2) + railties (~> 4.0) + sprockets-rails (>= 2.0, < 4.0) will_paginate (3.0.7) will_paginate-foundation (5.3.4) will_paginate (>= 3.0.3) @@ -143,18 +177,20 @@ PLATFORMS DEPENDENCIES better_errors binding_of_caller - coffee-rails (~> 4.0.0) + byebug + coffee-rails (~> 4.1.0) fancybox2-rails (~> 0.2.4) foundation-rails - jbuilder (~> 1.2) + jbuilder (~> 2.0) jquery-rails - meta_request pg pg_search - rails (= 4.0.0) - sass-rails (~> 4.0.0) - sdoc + rails (= 4.2.0) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) slim-rails + spring uglifier (>= 1.3.0) + web-console (~> 2.0) will_paginate will_paginate-foundation