Skip to content

Commit

Permalink
Update gems to rails 5
Browse files Browse the repository at this point in the history
  • Loading branch information
@nono
nono committed Apr 15, 2018
1 parent 6696994 commit 08d712e
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 100 deletions.
17 changes: 8 additions & 9 deletions Gemfile
View file
@@ -1,25 +1,25 @@
source 'https://rubygems.org'

gem "rails", "4.2.8"
gem "rails", "5.0.5"

gem "actionpack-page_caching", "~>1.0"
gem "actionpack-page_caching", "~>1.1"
gem "ansi", "~>1.4", require: nil
gem "acts_as_list", "~>0.4"
gem "bitfields", "~>0.4"
gem "canable", "~>0.1"
gem "carrierwave", "~>0.10"
gem "devise", "~>3.3"
gem "carrierwave", "~>1.1"
gem "devise", "~>4.3"
gem "diff_match_patch", git: "https://github.com/nono/diff_match_patch-ruby.git", require: "diff_match_patch"
gem "doorkeeper", "~>2.1"
gem "ffi-hunspell", git: "https://github.com/postmodern/ffi-hunspell.git"
gem "french_rails", "~>0.3"
gem "french_rails", "~>0.4"
gem "friendly_id", "~>5.1"
gem "haml", "~>4.0"
gem "html-pipeline-linuxfr", "~>0.14"
gem "html-pipeline-linuxfr", "~>0.15"
gem "html_spellchecker", "~>0.1"
gem "html_truncator", "~>0.4"
gem "htmlentities", "~>4.3"
gem "inherited_resources", "~>1.6"
gem "inherited_resources", "~>1.7"
gem "kaminari", "~>0.15"
gem "mini_magick", "~>3.8"
gem "mysql2", "~>0.3"
Expand Down Expand Up @@ -52,7 +52,6 @@ group :development do
gem "letter_opener"
gem "mo"
gem "pry-rails"
gem "quiet_assets"
gem "spring"
gem "sushi"
gem "thin"
Expand All @@ -69,5 +68,5 @@ end
group :production, :alpha do
gem "unicorn", "~>5.1"
gem "gctools", "~>0.2"
gem "redis-activesupport", "~>4.0"
gem "redis-activesupport", "~>5.0"
end
181 changes: 90 additions & 91 deletions Gemfile.lock
View file
Expand Up @@ -26,41 +26,44 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
actioncable (5.0.5)
actionpack (= 5.0.5)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.5)
actionpack (= 5.0.5)
actionview (= 5.0.5)
activejob (= 5.0.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
actionpack (5.0.5)
actionview (= 5.0.5)
activesupport (= 5.0.5)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5)
actionview (4.2.8)
activesupport (= 4.2.8)
actionpack-page_caching (1.1.0)
actionpack (>= 4.0.0, < 6)
actionview (5.0.5)
activesupport (= 5.0.5)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.8)
activejob (5.0.5)
activesupport (= 5.0.5)
globalid (>= 0.3.6)
activemodel (5.0.5)
activesupport (= 5.0.5)
activerecord (5.0.5)
activemodel (= 5.0.5)
activesupport (= 5.0.5)
arel (~> 7.0)
activesupport (5.0.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts_as_list (0.9.7)
activerecord (>= 3.0)
Expand All @@ -70,7 +73,7 @@ GEM
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 13.0)
ansi (1.5.0)
arel (6.0.4)
arel (7.1.4)
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand All @@ -92,12 +95,10 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
carrierwave (0.11.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
carrierwave (1.1.0)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
mimemagic (>= 0.3.0)
coderay (1.1.1)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
Expand All @@ -111,12 +112,11 @@ GEM
daemons (1.2.4)
database_cleaner (1.6.1)
debug_inspector (0.0.3)
devise (3.5.10)
devise (4.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
railties (>= 4.1.0, < 5.2)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.3)
doorkeeper (2.2.2)
Expand All @@ -131,25 +131,25 @@ GEM
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
ffi (1.9.18)
french_rails (0.3.0)
rails (~> 4.0)
french_rails (0.4.0)
rails (~> 5.0)
friendly_id (5.2.1)
activerecord (>= 4.0.0)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
gctools (0.2.4)
globalid (0.3.7)
activesupport (>= 4.1.0)
globalid (0.4.0)
activesupport (>= 4.2.0)
haml (4.0.7)
tilt
has_scope (0.6.0)
actionpack (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
has_scope (0.7.1)
actionpack (>= 4.1, < 5.2)
activesupport (>= 4.1, < 5.2)
highline (1.7.8)
hiredis (0.6.1)
html-pipeline-linuxfr (0.14.30)
activesupport (~> 4.2)
html-pipeline-linuxfr (0.15.0)
activesupport (~> 5.0)
escape_utils (~> 1.2)
nokogiri (~> 1.6)
patron (~> 0.8)
Expand All @@ -164,16 +164,15 @@ GEM
htmlentities (4.3.4)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
inherited_resources (1.6.0)
actionpack (>= 3.2, < 5)
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
inherited_resources (1.7.2)
actionpack (>= 3.2, < 5.2.x)
has_scope (~> 0.6)
railties (>= 3.2, < 5.2.x)
responders
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.1.0)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -191,7 +190,6 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_magick (3.8.1)
subexec (~> 0.2.1)
mini_mime (0.1.4)
Expand All @@ -208,6 +206,7 @@ GEM
net-ssh (4.1.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nio4r (2.1.0)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
nokogumbo (1.4.13)
Expand All @@ -222,34 +221,32 @@ GEM
pry (>= 0.9.10)
public_suffix (2.0.5)
multi_json (>= 1.0.0)
pygments.rb (1.2.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.8)
pygments.rb (1.2.1)
multi_json (>= 1.0.0)
rack (2.0.3)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.8)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails (5.0.5)
actioncable (= 5.0.5)
actionmailer (= 5.0.5)
actionpack (= 5.0.5)
actionview (= 5.0.5)
activejob (= 5.0.5)
activemodel (= 5.0.5)
activerecord (= 5.0.5)
activesupport (= 5.0.5)
bundler (>= 1.3.0)
railties (= 5.0.5)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
railties (5.0.5)
actionpack (= 5.0.5)
activesupport (= 5.0.5)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.17.0)
Expand All @@ -258,11 +255,11 @@ GEM
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redcarpet (3.4.0)
redis (3.3.2)
redis-activesupport (4.1.5)
activesupport (>= 3, < 5)
redis-store (~> 1.1.0)
redis-store (1.1.7)
redis (3.3.3)
redis-activesupport (5.0.3)
activesupport (>= 3, < 6)
redis-store (~> 1.3.0)
redis-store (1.3.0)
redis (>= 2.2)
ref (2.0.0)
responders (2.4.0)
Expand Down Expand Up @@ -325,7 +322,7 @@ GEM
rack (>= 1, < 3)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.5)
tilt (2.0.8)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (3.2.0)
Expand All @@ -340,14 +337,17 @@ GEM
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
actionpack-page_caching (~> 1.0)
actionpack-page_caching (~> 1.1)
acts_as_list (~> 0.4)
annotate
ansi (~> 1.4)
Expand All @@ -359,25 +359,25 @@ DEPENDENCIES
capistrano (~> 2.15)!
capistrano-maintenance
capybara (~> 2.4)
carrierwave (~> 0.10)
carrierwave (~> 1.1)
coffee-rails (~> 4.1)
database_cleaner (~> 1.2)
devise (~> 3.3)
devise (~> 4.3)
diff_match_patch!
doorkeeper (~> 2.1)
factory_girl_rails (~> 1.6)
ffi-hunspell!
french_rails (~> 0.3)
french_rails (~> 0.4)
friendly_id (~> 5.1)
fuubar (~> 2.0)
gctools (~> 0.2)
haml (~> 4.0)
hiredis (~> 0.5)
html-pipeline-linuxfr (~> 0.14)
html-pipeline-linuxfr (~> 0.15)
html_spellchecker (~> 0.1)
html_truncator (~> 0.4)
htmlentities (~> 4.3)
inherited_resources (~> 1.6)
inherited_resources (~> 1.7)
jquery-rails (~> 4.0)
kaminari (~> 0.15)
letter_opener
Expand All @@ -386,10 +386,9 @@ DEPENDENCIES
mysql2 (~> 0.3)
nokogiri (= 1.6.5)
pry-rails
quiet_assets
rails (= 4.2.8)
rails (= 5.0.5)
redis (~> 3.0)
redis-activesupport (~> 4.0)
redis-activesupport (~> 5.0)
rinku (~> 1.7)
rspec-rails (~> 3.2)
sass-rails (~> 5.0)
Expand Down
2 changes: 2 additions & 0 deletions config/environments/development.rb
View file
Expand Up @@ -26,6 +26,8 @@
# Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load

config.assets.quiet = true

# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
Expand Down

0 comments on commit 08d712e

Please sign in to comment.