chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Rails 5.0.1

Browse source
This commit is contained in:
Christoph Haas 2016-10-29 17:42:23 +02:00
parent f3fe5c5bca
commit dd9c2dc4c4
2 changed files with 165 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

85
Gemfile
View file

@ -1,54 +1,41 @@
source 'https://rubygems.org' source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.0' gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
# Use sqlite3 as the database for Active Record
# gem 'sqlite3'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0' gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
# Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.2'
gem 'coffee-rails', '~> 4.1.0' # See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby
# Use jquery as the JavaScript library # Use jquery as the JavaScript library
gem 'jquery-rails' gem 'jquery-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks', '~> 5'
# Funky side-effects - so we better not use Turbolinks
#gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0' gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
group :doc do # gem 'redis', '~> 3.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0'
end
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0' # gem 'bcrypt', '~> 3.1.7'
# Use unicorn as the app server
# gem 'unicorn'
# Use Capistrano for deployment # 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 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 "better_errors"
gem "binding_of_caller" 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 # Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug' gem 'byebug'
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
# Chrome Rails debugging app # Chrome Rails debugging app
#gem 'meta_request' #gem 'meta_request'
end 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 group :development, :test do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring' gem 'spring'
@ -74,6 +76,9 @@ group :development, :test do
gem 'minitest-rails' gem 'minitest-rails'
gem 'guard-minitest' gem 'guard-minitest'
gem 'minitest-reporters' gem 'minitest-reporters'
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
end end
# Zurb Foundation # Zurb Foundation
@ -89,7 +94,7 @@ gem 'will_paginate'
#gem 'will_paginate-foundation' #gem 'will_paginate-foundation'
# Lightbox image viewer for full-sized images # 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 # Trying pg_search for full-text search… too slow with ranking… screw PostgreSQL
gem 'pg_search' gem 'pg_search'
@ -98,7 +103,7 @@ gem 'pg_search'
gem 'slim-rails' gem 'slim-rails'
# Attachment/image handling # Attachment/image handling
gem "paperclip", "~> 4.2" gem "paperclip"
# Comply with stupid european cookie law # Comply with stupid european cookie law
gem 'cookies_eu' gem 'cookies_eu'
@ -113,3 +118,7 @@ gem 'devise'
gem "font-awesome-rails" gem "font-awesome-rails"
gem "recaptcha", require: "recaptcha/rails" gem "recaptcha", require: "recaptcha/rails"
gem "sprockets", '3.6.3'
#gem "activemodel-serializers-xml"

222
Gemfile.lock
View file

@ -7,43 +7,45 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.2.0) actioncable (5.0.0.1)
actionpack (= 4.2.0) actionpack (= 5.0.0.1)
actionview (= 4.2.0) nio4r (~> 1.2)
activejob (= 4.2.0) 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) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 2.0)
actionpack (4.2.0) actionpack (5.0.0.1)
actionview (= 4.2.0) actionview (= 5.0.0.1)
activesupport (= 4.2.0) activesupport (= 5.0.0.1)
rack (~> 1.6.0) rack (~> 2.0)
rack-test (~> 0.6.2) rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.1) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.0) actionview (5.0.0.1)
activesupport (= 4.2.0) activesupport (= 5.0.0.1)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.1) rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.0) activejob (5.0.0.1)
activesupport (= 4.2.0) activesupport (= 5.0.0.1)
globalid (>= 0.3.0) globalid (>= 0.3.6)
activemodel (4.2.0) activemodel (5.0.0.1)
activesupport (= 4.2.0) activesupport (= 5.0.0.1)
builder (~> 3.1) activerecord (5.0.0.1)
activerecord (4.2.0) activemodel (= 5.0.0.1)
activemodel (= 4.2.0) activesupport (= 5.0.0.1)
activesupport (= 4.2.0) arel (~> 7.0)
arel (~> 6.0) activesupport (5.0.0.1)
activesupport (4.2.0) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
ansi (1.5.0) ansi (1.5.0)
arel (6.0.3) arel (7.1.4)
babel-source (5.8.35) babel-source (5.8.35)
babel-transpiler (0.7.0) babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6) babel-source (>= 4.0, < 6)
@ -56,24 +58,23 @@ GEM
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.2) builder (3.2.2)
byebug (9.0.5) byebug (9.0.6)
choice (0.2.0) choice (0.2.0)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
cocaine (0.5.8) cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1) coderay (1.1.1)
coffee-rails (4.1.1) coffee-rails (4.2.1)
coffee-script (>= 2.2.0) 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 (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.10.0)
concurrent-ruby (1.0.2) concurrent-ruby (1.0.2)
cookies_eu (1.3.0) cookies_eu (1.6.0)
jquery-cookie-rails js_cookie_rails
jquery-rails
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (4.2.0) devise (4.2.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
@ -83,13 +84,13 @@ GEM
warden (~> 1.2.3) warden (~> 1.2.3)
erubis (2.7.0) erubis (2.7.0)
execjs (2.7.0) execjs (2.7.0)
fancybox2-rails (0.2.8) fancybox2-rails (0.2.7)
railties (>= 3.1.0, < 5.0) railties (>= 3.1.0)
ffi (1.9.14) ffi (1.9.14)
font-awesome-rails (4.6.3.1) font-awesome-rails (4.7.0.0)
railties (>= 3.2, < 5.1) railties (>= 3.2, < 5.1)
formatador (0.2.5) formatador (0.2.5)
foundation-rails (6.2.3.0) foundation-rails (6.2.4.0)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0) sprockets-es6 (>= 0.9.0)
@ -115,18 +116,17 @@ GEM
jbuilder (2.6.0) jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1) activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-cookie-rails (1.3.1.1) jquery-rails (4.2.1)
railties (>= 3.2.0, < 5.0)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
js_cookie_rails (2.1.3)
railties (>= 3.1)
json (1.8.3) json (1.8.3)
libv8 (3.16.14.15) libv8 (3.16.14.15)
listen (3.1.5) listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.0.3) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.10) lumberjack (1.0.10)
@ -136,88 +136,86 @@ GEM
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mimemagic (0.3.0) mimemagic (0.3.2)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.9.0) minitest (5.9.1)
minitest-rails (2.2.1) minitest-rails (3.0.0)
minitest (~> 5.7) minitest (~> 5.8)
railties (~> 4.1) railties (~> 5.0)
minitest-reporters (1.1.11) minitest-reporters (1.1.12)
ansi ansi
builder builder
minitest (>= 5.0) minitest (>= 5.0)
ruby-progressbar ruby-progressbar
multi_json (1.12.1) multi_json (1.12.1)
nenv (0.3.0) nenv (0.3.0)
nokogiri (1.6.8) nio4r (1.2.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paperclip (4.3.7) paperclip (5.1.0)
activemodel (>= 3.2.0) activemodel (>= 4.2.0)
activesupport (>= 3.2.0) activesupport (>= 4.2.0)
cocaine (~> 0.5.5) cocaine (~> 0.5.5)
mime-types mime-types
mimemagic (= 0.3.0) mimemagic (~> 0.3.0)
pg (0.18.4) pg (0.19.0)
pg_search (1.0.6) pg_search (1.0.6)
activerecord (>= 3.1) activerecord (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
arel arel
pkg-config (1.1.7)
pry (0.10.4) pry (0.10.4)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
rack (1.6.4) puma (3.6.0)
rack (2.0.1)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.0) rails (5.0.0.1)
actionmailer (= 4.2.0) actioncable (= 5.0.0.1)
actionpack (= 4.2.0) actionmailer (= 5.0.0.1)
actionview (= 4.2.0) actionpack (= 5.0.0.1)
activejob (= 4.2.0) actionview (= 5.0.0.1)
activemodel (= 4.2.0) activejob (= 5.0.0.1)
activerecord (= 4.2.0) activemodel (= 5.0.0.1)
activesupport (= 4.2.0) activerecord (= 5.0.0.1)
activesupport (= 5.0.0.1)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0) railties (= 5.0.0.1)
sprockets-rails sprockets-rails (>= 2.0.0)
rails-deprecated_sanitizer (1.0.3) rails-dom-testing (2.0.1)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0, < 6.0)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1) rails-erd (1.5.0)
rails-erd (1.4.7)
activerecord (>= 3.2) activerecord (>= 3.2)
activesupport (>= 3.2) activesupport (>= 3.2)
choice (~> 0.2.0) choice (~> 0.2.0)
ruby-graphviz (~> 1.2) ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
railties (4.2.0) railties (5.0.0.1)
actionpack (= 4.2.0) actionpack (= 5.0.0.1)
activesupport (= 4.2.0) activesupport (= 5.0.0.1)
method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (11.2.2) rake (11.3.0)
rb-fsevent (0.9.7) rb-fsevent (0.9.8)
rb-inotify (0.9.7) rb-inotify (0.9.7)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (4.2.2) rdoc (4.2.2)
json (~> 1.4) json (~> 1.4)
recaptcha (3.3.0) recaptcha (3.4.0)
json json
ref (2.0.0) ref (2.0.0)
responders (2.2.0) responders (2.3.0)
railties (>= 4.2.0, < 5.1) railties (>= 4.2.0, < 5.1)
ruby-graphviz (1.2.2) ruby-graphviz (1.2.2)
ruby-progressbar (1.8.1) ruby-progressbar (1.8.1)
ruby_dep (1.3.1)
sass (3.4.22) sass (3.4.22)
sass-rails (5.0.6) sass-rails (5.0.6)
railties (>= 4.0.0, < 6) railties (>= 4.0.0, < 6)
@ -225,27 +223,31 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sdoc (0.4.1) sdoc (0.4.2)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
shellany (0.0.1) shellany (0.0.1)
slim (3.0.7) slim (3.0.7)
temple (~> 0.7.6) temple (~> 0.7.6)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slim-rails (3.1.0) slim-rails (3.1.1)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
slim (~> 3.0) slim (~> 3.0)
slop (3.6.0) slop (3.6.0)
spring (1.7.2) spring (2.0.0)
sprockets (3.7.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) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-es6 (0.9.0) sprockets-es6 (0.9.2)
babel-source (>= 5.8.11) babel-source (>= 5.8.11)
babel-transpiler babel-transpiler
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sprockets-rails (3.1.1) sprockets-rails (3.2.0)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
@ -256,18 +258,24 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (2.0.5) tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (3.0.1) uglifier (3.0.3)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
warden (1.2.6) warden (1.2.6)
rack (>= 1.0) rack (>= 1.0)
web-console (2.3.0) web-console (3.3.1)
activemodel (>= 4.0) actionview (>= 5.0)
binding_of_caller (>= 0.7.2) activemodel (>= 5.0)
railties (>= 4.0) debug_inspector
sprockets-rails (>= 2.0, < 4.0) railties (>= 5.0)
will_paginate (3.1.0) websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
will_paginate (3.1.5)
PLATFORMS PLATFORMS
ruby ruby
@ -277,32 +285,38 @@ DEPENDENCIES
binding_of_caller binding_of_caller
byebug byebug
bzip2-ruby! bzip2-ruby!
coffee-rails (~> 4.1.0) coffee-rails (~> 4.2)
cookies_eu cookies_eu
devise devise
fancybox2-rails (~> 0.2.8) fancybox2-rails
font-awesome-rails font-awesome-rails
foundation-rails (~> 6.2) foundation-rails (~> 6.2)
guard-minitest guard-minitest
guard-rails guard-rails
jbuilder (~> 2.0) jbuilder (~> 2.5)
jquery-rails jquery-rails
listen (~> 3.0.5)
minitest-rails minitest-rails
minitest-reporters minitest-reporters
paperclip (~> 4.2) paperclip
pg pg
pg_search pg_search
rails (= 4.2.0) puma (~> 3.0)
rails (~> 5.0.0, >= 5.0.0.1)
rails-erd rails-erd
recaptcha recaptcha
sass-rails (~> 5.0) sass-rails (~> 5.0)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
slim-rails slim-rails
spring spring
spring-watcher-listen (~> 2.0.0)
sprockets (= 3.6.3)
therubyracer therubyracer
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
web-console (~> 2.0) web-console
will_paginate will_paginate
BUNDLED WITH BUNDLED WITH
1.12.5 1.13.6