Use Ruby 2.6, update a bunch of gems
This commit is contained in:
parent
5a9e745bf0
commit
b602edafa3
|
@ -1 +1 @@
|
||||||
2.3.8
|
2.6.2
|
||||||
|
|
6
Gemfile
6
Gemfile
|
@ -19,14 +19,14 @@ gem 'sdoc', '~> 0.4.1', group: :doc
|
||||||
gem 'bcrypt', '~> 3.1.7'
|
gem 'bcrypt', '~> 3.1.7'
|
||||||
|
|
||||||
gem 'haml'
|
gem 'haml'
|
||||||
gem 'bootstrap-sass', '~> 3.2.0.1'
|
gem 'bootstrap-sass', '~> 3.4.0'
|
||||||
gem 'bootswatch-rails'
|
gem 'bootswatch-rails'
|
||||||
gem 'sweetalert-rails'
|
gem 'sweetalert-rails'
|
||||||
gem 'will_paginate'
|
gem 'will_paginate'
|
||||||
gem 'will_paginate-bootstrap'
|
gem 'will_paginate-bootstrap'
|
||||||
gem 'devise'
|
gem 'devise', '~> 4.0'
|
||||||
gem 'devise-i18n'
|
gem 'devise-i18n'
|
||||||
gem 'devise-async'
|
gem 'devise-async' # TODO: bring this to 1.0 after rails5 upgrade
|
||||||
gem 'bootstrap_form'
|
gem 'bootstrap_form'
|
||||||
gem 'font-kit-rails'
|
gem 'font-kit-rails'
|
||||||
gem 'nprogress-rails'
|
gem 'nprogress-rails'
|
||||||
|
|
38
Gemfile.lock
38
Gemfile.lock
|
@ -48,15 +48,18 @@ GEM
|
||||||
airbrussh (1.1.2)
|
airbrussh (1.1.2)
|
||||||
sshkit (>= 1.6.1, != 1.7.0)
|
sshkit (>= 1.6.1, != 1.7.0)
|
||||||
arel (6.0.4)
|
arel (6.0.4)
|
||||||
bcrypt (3.1.11)
|
autoprefixer-rails (9.5.0)
|
||||||
|
execjs
|
||||||
|
bcrypt (3.1.12)
|
||||||
better_errors (2.1.1)
|
better_errors (2.1.1)
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
rack (>= 0.9.0)
|
rack (>= 0.9.0)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
bootstrap-sass (3.2.0.2)
|
bootstrap-sass (3.4.1)
|
||||||
sass (~> 3.2)
|
autoprefixer-rails (>= 5.2.1)
|
||||||
|
sassc (>= 2.0.0)
|
||||||
bootstrap3-datetimepicker-rails (4.7.14)
|
bootstrap3-datetimepicker-rails (4.7.14)
|
||||||
momentjs-rails (>= 2.8.1)
|
momentjs-rails (>= 2.8.1)
|
||||||
bootstrap_form (2.6.0)
|
bootstrap_form (2.6.0)
|
||||||
|
@ -99,22 +102,21 @@ GEM
|
||||||
colorize (0.8.1)
|
colorize (0.8.1)
|
||||||
concurrent-ruby (1.0.5)
|
concurrent-ruby (1.0.5)
|
||||||
connection_pool (2.2.1)
|
connection_pool (2.2.1)
|
||||||
crass (1.0.2)
|
crass (1.0.4)
|
||||||
daemons (1.2.4)
|
daemons (1.2.4)
|
||||||
database_cleaner (1.5.3)
|
database_cleaner (1.5.3)
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
delayed_paperclip (3.0.1)
|
delayed_paperclip (3.0.1)
|
||||||
activejob (>= 4.2)
|
activejob (>= 4.2)
|
||||||
paperclip (>= 3.3)
|
paperclip (>= 3.3)
|
||||||
devise (3.5.10)
|
devise (4.6.2)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 3.2.6, < 5)
|
railties (>= 4.1.0, < 6.0)
|
||||||
responders
|
responders
|
||||||
thread_safe (~> 0.1)
|
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
devise-async (0.10.2)
|
devise-async (0.7.0)
|
||||||
devise (>= 3.2, < 4.0)
|
devise (>= 2.2)
|
||||||
devise-i18n (1.1.2)
|
devise-i18n (1.1.2)
|
||||||
diff-lcs (1.3)
|
diff-lcs (1.3)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
|
@ -314,7 +316,8 @@ GEM
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
httparty (0.14.0)
|
httparty (0.14.0)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
i18n (0.8.1)
|
i18n (0.9.5)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
i18n-js (3.0.0.rc10)
|
i18n-js (3.0.0.rc10)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
inflecto (0.0.2)
|
inflecto (0.0.2)
|
||||||
|
@ -374,7 +377,7 @@ GEM
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (4.1.0)
|
net-ssh (4.1.0)
|
||||||
newrelic_rpm (4.2.0.334)
|
newrelic_rpm (4.2.0.334)
|
||||||
nokogiri (1.10.1)
|
nokogiri (1.10.2)
|
||||||
mini_portile2 (~> 2.4.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
nokogumbo (2.0.1)
|
nokogumbo (2.0.1)
|
||||||
nokogiri (~> 1.8, >= 1.8.4)
|
nokogiri (~> 1.8, >= 1.8.4)
|
||||||
|
@ -438,8 +441,8 @@ GEM
|
||||||
rails-assets-jquery (2.2.4)
|
rails-assets-jquery (2.2.4)
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
rails-dom-testing (1.0.8)
|
rails-dom-testing (1.0.9)
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
activesupport (>= 4.2.0, < 5.0)
|
||||||
nokogiri (~> 1.6)
|
nokogiri (~> 1.6)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.0.4)
|
rails-html-sanitizer (1.0.4)
|
||||||
|
@ -466,7 +469,7 @@ GEM
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.18.0)
|
raindrops (0.18.0)
|
||||||
rake (12.0.0)
|
rake (12.3.2)
|
||||||
rb-fsevent (0.9.8)
|
rb-fsevent (0.9.8)
|
||||||
rb-inotify (0.9.8)
|
rb-inotify (0.9.8)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
|
@ -513,6 +516,9 @@ GEM
|
||||||
sass (~> 3.2.2)
|
sass (~> 3.2.2)
|
||||||
sprockets (~> 2.8, < 3.0)
|
sprockets (~> 2.8, < 3.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
|
sassc (2.0.1)
|
||||||
|
ffi (~> 1.9)
|
||||||
|
rake
|
||||||
sdoc (0.4.2)
|
sdoc (0.4.2)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
|
@ -617,7 +623,7 @@ PLATFORMS
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
bcrypt (~> 3.1.7)
|
bcrypt (~> 3.1.7)
|
||||||
better_errors
|
better_errors
|
||||||
bootstrap-sass (~> 3.2.0.1)
|
bootstrap-sass (~> 3.4.0)
|
||||||
bootstrap3-datetimepicker-rails (~> 4.7.14)
|
bootstrap3-datetimepicker-rails (~> 4.7.14)
|
||||||
bootstrap_form
|
bootstrap_form
|
||||||
bootswatch-rails
|
bootswatch-rails
|
||||||
|
@ -630,7 +636,7 @@ DEPENDENCIES
|
||||||
colorize
|
colorize
|
||||||
database_cleaner
|
database_cleaner
|
||||||
delayed_paperclip
|
delayed_paperclip
|
||||||
devise
|
devise (~> 4.0)
|
||||||
devise-async
|
devise-async
|
||||||
devise-i18n
|
devise-i18n
|
||||||
factory_girl_rails
|
factory_girl_rails
|
||||||
|
|
Loading…
Reference in New Issue