Merge branch 'next-minor' into develop
This commit is contained in:
commit
6519ded5ec
2 changed files with 45 additions and 45 deletions
2
Gemfile
2
Gemfile
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
source "https://rubygems.org"
|
source "https://rubygems.org"
|
||||||
|
|
||||||
gem "rails", "5.2.4.2"
|
gem "rails", "5.2.4.3"
|
||||||
|
|
||||||
# Legacy Rails features, remove me!
|
# Legacy Rails features, remove me!
|
||||||
# responders (class level)
|
# responders (class level)
|
||||||
|
|
|
||||||
88
Gemfile.lock
88
Gemfile.lock
|
|
@ -2,25 +2,25 @@ GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
remote: https://gems.diasporafoundation.org/
|
remote: https://gems.diasporafoundation.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.2.4.2)
|
actioncable (5.2.4.3)
|
||||||
actionpack (= 5.2.4.2)
|
actionpack (= 5.2.4.3)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailer (5.2.4.2)
|
actionmailer (5.2.4.3)
|
||||||
actionpack (= 5.2.4.2)
|
actionpack (= 5.2.4.3)
|
||||||
actionview (= 5.2.4.2)
|
actionview (= 5.2.4.3)
|
||||||
activejob (= 5.2.4.2)
|
activejob (= 5.2.4.3)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.2.4.2)
|
actionpack (5.2.4.3)
|
||||||
actionview (= 5.2.4.2)
|
actionview (= 5.2.4.3)
|
||||||
activesupport (= 5.2.4.2)
|
activesupport (= 5.2.4.3)
|
||||||
rack (~> 2.0, >= 2.0.8)
|
rack (~> 2.0, >= 2.0.8)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (5.2.4.2)
|
actionview (5.2.4.3)
|
||||||
activesupport (= 5.2.4.2)
|
activesupport (= 5.2.4.3)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
|
|
@ -28,22 +28,22 @@ GEM
|
||||||
active_model_serializers (0.9.7)
|
active_model_serializers (0.9.7)
|
||||||
activemodel (>= 3.2)
|
activemodel (>= 3.2)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
activejob (5.2.4.2)
|
activejob (5.2.4.3)
|
||||||
activesupport (= 5.2.4.2)
|
activesupport (= 5.2.4.3)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.2.4.2)
|
activemodel (5.2.4.3)
|
||||||
activesupport (= 5.2.4.2)
|
activesupport (= 5.2.4.3)
|
||||||
activerecord (5.2.4.2)
|
activerecord (5.2.4.3)
|
||||||
activemodel (= 5.2.4.2)
|
activemodel (= 5.2.4.3)
|
||||||
activesupport (= 5.2.4.2)
|
activesupport (= 5.2.4.3)
|
||||||
arel (>= 9.0)
|
arel (>= 9.0)
|
||||||
activerecord-import (1.0.4)
|
activerecord-import (1.0.4)
|
||||||
activerecord (>= 3.2)
|
activerecord (>= 3.2)
|
||||||
activestorage (5.2.4.2)
|
activestorage (5.2.4.3)
|
||||||
actionpack (= 5.2.4.2)
|
actionpack (= 5.2.4.3)
|
||||||
activerecord (= 5.2.4.2)
|
activerecord (= 5.2.4.3)
|
||||||
marcel (~> 0.3.1)
|
marcel (~> 0.3.1)
|
||||||
activesupport (5.2.4.2)
|
activesupport (5.2.4.3)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
|
@ -335,7 +335,7 @@ GEM
|
||||||
mime-types (~> 3.0)
|
mime-types (~> 3.0)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
httpclient (2.8.3)
|
httpclient (2.8.3)
|
||||||
i18n (1.8.2)
|
i18n (1.8.3)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
i18n-inflector (2.6.7)
|
i18n-inflector (2.6.7)
|
||||||
i18n (>= 0.4.1)
|
i18n (>= 0.4.1)
|
||||||
|
|
@ -390,7 +390,7 @@ GEM
|
||||||
multi_json (~> 1.10)
|
multi_json (~> 1.10)
|
||||||
logging-rails (0.6.0)
|
logging-rails (0.6.0)
|
||||||
logging (>= 1.8)
|
logging (>= 1.8)
|
||||||
loofah (2.4.0)
|
loofah (2.5.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
lumberjack (1.2.4)
|
lumberjack (1.2.4)
|
||||||
|
|
@ -408,11 +408,11 @@ GEM
|
||||||
mime-types (3.3.1)
|
mime-types (3.3.1)
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2019.1009)
|
mime-types-data (3.2019.1009)
|
||||||
mimemagic (0.3.4)
|
mimemagic (0.3.5)
|
||||||
mini_magick (4.10.1)
|
mini_magick (4.10.1)
|
||||||
mini_mime (1.0.2)
|
mini_mime (1.0.2)
|
||||||
mini_portile2 (2.4.0)
|
mini_portile2 (2.4.0)
|
||||||
minitest (5.14.0)
|
minitest (5.14.1)
|
||||||
mobile-fu (1.4.0)
|
mobile-fu (1.4.0)
|
||||||
rack-mobile-detect
|
rack-mobile-detect
|
||||||
rails
|
rails
|
||||||
|
|
@ -528,18 +528,18 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (1.1.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rails (5.2.4.2)
|
rails (5.2.4.3)
|
||||||
actioncable (= 5.2.4.2)
|
actioncable (= 5.2.4.3)
|
||||||
actionmailer (= 5.2.4.2)
|
actionmailer (= 5.2.4.3)
|
||||||
actionpack (= 5.2.4.2)
|
actionpack (= 5.2.4.3)
|
||||||
actionview (= 5.2.4.2)
|
actionview (= 5.2.4.3)
|
||||||
activejob (= 5.2.4.2)
|
activejob (= 5.2.4.3)
|
||||||
activemodel (= 5.2.4.2)
|
activemodel (= 5.2.4.3)
|
||||||
activerecord (= 5.2.4.2)
|
activerecord (= 5.2.4.3)
|
||||||
activestorage (= 5.2.4.2)
|
activestorage (= 5.2.4.3)
|
||||||
activesupport (= 5.2.4.2)
|
activesupport (= 5.2.4.3)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.2.4.2)
|
railties (= 5.2.4.3)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-assets-autosize (4.0.2)
|
rails-assets-autosize (4.0.2)
|
||||||
rails-assets-backbone (1.3.3)
|
rails-assets-backbone (1.3.3)
|
||||||
|
|
@ -591,9 +591,9 @@ GEM
|
||||||
rails-timeago (2.18.0)
|
rails-timeago (2.18.0)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
activesupport (>= 3.1)
|
activesupport (>= 3.1)
|
||||||
railties (5.2.4.2)
|
railties (5.2.4.3)
|
||||||
actionpack (= 5.2.4.2)
|
actionpack (= 5.2.4.3)
|
||||||
activesupport (= 5.2.4.2)
|
activesupport (= 5.2.4.3)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.19.0, < 2.0)
|
thor (>= 0.19.0, < 2.0)
|
||||||
|
|
@ -747,7 +747,7 @@ GEM
|
||||||
unf (~> 0.1.0)
|
unf (~> 0.1.0)
|
||||||
typhoeus (1.3.1)
|
typhoeus (1.3.1)
|
||||||
ethon (>= 0.9.0)
|
ethon (>= 0.9.0)
|
||||||
tzinfo (1.2.6)
|
tzinfo (1.2.7)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (4.2.0)
|
uglifier (4.2.0)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
|
|
@ -783,9 +783,9 @@ GEM
|
||||||
addressable (>= 2.3.6)
|
addressable (>= 2.3.6)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff (>= 0.4.0, < 2.0.0)
|
hashdiff (>= 0.4.0, < 2.0.0)
|
||||||
websocket-driver (0.7.1)
|
websocket-driver (0.7.2)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.4)
|
websocket-extensions (0.1.5)
|
||||||
will_paginate (3.3.0)
|
will_paginate (3.3.0)
|
||||||
xpath (3.2.0)
|
xpath (3.2.0)
|
||||||
nokogiri (~> 1.8)
|
nokogiri (~> 1.8)
|
||||||
|
|
@ -874,7 +874,7 @@ DEPENDENCIES
|
||||||
rack-piwik (= 0.3.0)
|
rack-piwik (= 0.3.0)
|
||||||
rack-rewrite (= 1.5.1)
|
rack-rewrite (= 1.5.1)
|
||||||
rack-ssl (= 1.4.1)
|
rack-ssl (= 1.4.1)
|
||||||
rails (= 5.2.4.2)
|
rails (= 5.2.4.3)
|
||||||
rails-assets-autosize (= 4.0.2)!
|
rails-assets-autosize (= 4.0.2)!
|
||||||
rails-assets-backbone (= 1.3.3)!
|
rails-assets-backbone (= 1.3.3)!
|
||||||
rails-assets-blueimp-gallery (= 2.33.0)!
|
rails-assets-blueimp-gallery (= 2.33.0)!
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue