From dd9c2dc4c457bf8e7b356f582ea9d548e2c54b06 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 29 Oct 2016 17:42:23 +0200 Subject: [PATCH] Update to Rails 5.0.1 --- Gemfile | 85 +++++++++++--------- Gemfile.lock | 222 +++++++++++++++++++++++++++------------------------ 2 files changed, 165 insertions(+), 142 deletions(-) diff --git a/Gemfile b/Gemfile index 31db6aa..2ef9bed 100644 --- a/Gemfile +++ b/Gemfile @@ -1,54 +1,41 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.0' - -# Use sqlite3 as the database for Active Record -# gem 'sqlite3' +gem 'rails', '~> 5.0.0', '>= 5.0.0.1' +# Use Puma as the app server +gem 'puma', '~> 3.0' # Use SCSS for stylesheets 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.1.0' - -# See https://github.com/sstephenson/execjs#readme for more supported runtimes -gem 'therubyracer', platforms: :ruby +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' - -# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -# Funky side-effects - so we better not use Turbolinks -#gem 'turbolinks' - +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' - -group :doc do - # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', '~> 0.4.0' -end - +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' # Use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# Use unicorn as the app server -# gem 'unicorn' +# gem 'bcrypt', '~> 3.1.7' # Use Capistrano for deployment -# gem 'capistrano', group: :development +# gem 'capistrano-rails', group: :development -# Use debugger -#gem 'debugger', group: [:development, :test] - -# PostgreSQL support -gem 'pg' group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console' + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' gem "better_errors" gem "binding_of_caller" @@ -57,13 +44,28 @@ group :development 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' - # Chrome Rails debugging app #gem 'meta_request' end +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + + + + +# See https://github.com/sstephenson/execjs#readme for more supported runtimes +gem 'therubyracer', platforms: :ruby + +group :doc do + # bundle exec rake doc:rails generates the API under doc/api. + gem 'sdoc', '~> 0.4.0' +end + +# PostgreSQL support +gem 'pg' + + group :development, :test do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' @@ -74,6 +76,9 @@ group :development, :test do gem 'minitest-rails' gem 'guard-minitest' gem 'minitest-reporters' + + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri end # Zurb Foundation @@ -89,7 +94,7 @@ gem 'will_paginate' #gem 'will_paginate-foundation' # Lightbox image viewer for full-sized images -gem 'fancybox2-rails', '~> 0.2.8' +gem 'fancybox2-rails' # Trying pg_search for full-text search… too slow with ranking… screw PostgreSQL gem 'pg_search' @@ -98,7 +103,7 @@ gem 'pg_search' gem 'slim-rails' # Attachment/image handling -gem "paperclip", "~> 4.2" +gem "paperclip" # Comply with stupid european cookie law gem 'cookies_eu' @@ -113,3 +118,7 @@ gem 'devise' gem "font-awesome-rails" gem "recaptcha", require: "recaptcha/rails" + +gem "sprockets", '3.6.3' + +#gem "activemodel-serializers-xml" diff --git a/Gemfile.lock b/Gemfile.lock index 127adec..62fa465 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,43 +7,45 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actioncable (5.0.0.1) + actionpack (= 5.0.0.1) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0.1) + actionpack (= 5.0.0.1) + actionview (= 5.0.0.1) + activejob (= 5.0.0.1) 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) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0) - activesupport (= 4.2.0) + rails-dom-testing (~> 2.0) + actionpack (5.0.0.1) + actionview (= 5.0.0.1) + activesupport (= 5.0.0.1) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.0.1) + activesupport (= 5.0.0.1) 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) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (5.0.0.1) + activesupport (= 5.0.0.1) + globalid (>= 0.3.6) + activemodel (5.0.0.1) + activesupport (= 5.0.0.1) + activerecord (5.0.0.1) + activemodel (= 5.0.0.1) + activesupport (= 5.0.0.1) + arel (~> 7.0) + activesupport (5.0.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) ansi (1.5.0) - arel (6.0.3) + arel (7.1.4) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -56,24 +58,23 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) - byebug (9.0.5) + byebug (9.0.6) choice (0.2.0) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.1) - coffee-rails (4.1.1) + coffee-rails (4.2.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.2.x) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) concurrent-ruby (1.0.2) - cookies_eu (1.3.0) - jquery-cookie-rails - jquery-rails + cookies_eu (1.6.0) + js_cookie_rails debug_inspector (0.0.2) devise (4.2.0) bcrypt (~> 3.0) @@ -83,13 +84,13 @@ GEM warden (~> 1.2.3) erubis (2.7.0) execjs (2.7.0) - fancybox2-rails (0.2.8) - railties (>= 3.1.0, < 5.0) + fancybox2-rails (0.2.7) + railties (>= 3.1.0) ffi (1.9.14) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.7.0.0) railties (>= 3.2, < 5.1) formatador (0.2.5) - foundation-rails (6.2.3.0) + foundation-rails (6.2.4.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) @@ -115,18 +116,17 @@ GEM jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-cookie-rails (1.3.1.1) - railties (>= 3.2.0, < 5.0) - jquery-rails (4.1.1) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + js_cookie_rails (2.1.3) + railties (>= 3.1) json (1.8.3) libv8 (3.16.14.15) - listen (3.1.5) + listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.10) @@ -136,88 +136,86 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.0) + mimemagic (0.3.2) mini_portile2 (2.1.0) - minitest (5.9.0) - minitest-rails (2.2.1) - minitest (~> 5.7) - railties (~> 4.1) - minitest-reporters (1.1.11) + minitest (5.9.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.12) ansi builder minitest (>= 5.0) ruby-progressbar multi_json (1.12.1) nenv (0.3.0) - nokogiri (1.6.8) + nio4r (1.2.1) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - paperclip (4.3.7) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) + paperclip (5.1.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) cocaine (~> 0.5.5) mime-types - mimemagic (= 0.3.0) - pg (0.18.4) + mimemagic (~> 0.3.0) + pg (0.19.0) pg_search (1.0.6) activerecord (>= 3.1) activesupport (>= 3.1) arel - pkg-config (1.1.7) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.6.4) + puma (3.6.0) + rack (2.0.1) rack-test (0.6.3) rack (>= 1.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) + rails (5.0.0.1) + actioncable (= 5.0.0.1) + actionmailer (= 5.0.0.1) + actionpack (= 5.0.0.1) + actionview (= 5.0.0.1) + activejob (= 5.0.0.1) + activemodel (= 5.0.0.1) + activerecord (= 5.0.0.1) + activesupport (= 5.0.0.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + railties (= 5.0.0.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.1) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-erd (1.4.7) + rails-erd (1.5.0) activerecord (>= 3.2) activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + railties (5.0.0.1) + actionpack (= 5.0.0.1) + activesupport (= 5.0.0.1) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) - rb-fsevent (0.9.7) + rake (11.3.0) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) rdoc (4.2.2) json (~> 1.4) - recaptcha (3.3.0) + recaptcha (3.4.0) json ref (2.0.0) - responders (2.2.0) + responders (2.3.0) railties (>= 4.2.0, < 5.1) ruby-graphviz (1.2.2) ruby-progressbar (1.8.1) - ruby_dep (1.3.1) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -225,27 +223,31 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) shellany (0.0.1) slim (3.0.7) temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) - slim-rails (3.1.0) + slim-rails (3.1.1) actionpack (>= 3.1) railties (>= 3.1) slim (~> 3.0) slop (3.6.0) - spring (1.7.2) - sprockets (3.7.0) + spring (2.0.0) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.0) + sprockets-es6 (0.9.2) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.1.1) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -256,18 +258,24 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.1) + uglifier (3.0.3) execjs (>= 0.3.0, < 3) warden (1.2.6) rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - will_paginate (3.1.0) + web-console (3.3.1) + actionview (>= 5.0) + activemodel (>= 5.0) + debug_inspector + railties (>= 5.0) + websocket-driver (0.6.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + will_paginate (3.1.5) PLATFORMS ruby @@ -277,32 +285,38 @@ DEPENDENCIES binding_of_caller byebug bzip2-ruby! - coffee-rails (~> 4.1.0) + coffee-rails (~> 4.2) cookies_eu devise - fancybox2-rails (~> 0.2.8) + fancybox2-rails font-awesome-rails foundation-rails (~> 6.2) guard-minitest guard-rails - jbuilder (~> 2.0) + jbuilder (~> 2.5) jquery-rails + listen (~> 3.0.5) minitest-rails minitest-reporters - paperclip (~> 4.2) + paperclip pg pg_search - rails (= 4.2.0) + puma (~> 3.0) + rails (~> 5.0.0, >= 5.0.0.1) rails-erd recaptcha sass-rails (~> 5.0) sdoc (~> 0.4.0) slim-rails spring + spring-watcher-listen (~> 2.0.0) + sprockets (= 3.6.3) therubyracer + turbolinks (~> 5) + tzinfo-data uglifier (>= 1.3.0) - web-console (~> 2.0) + web-console will_paginate BUNDLED WITH - 1.12.5 + 1.13.6