Skip to content

Commit

Permalink
Allow Rails 5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
simukappu committed May 5, 2018
1 parent 3b9bc14 commit a6ade8f
Show file tree
Hide file tree
Showing 10 changed files with 393 additions and 146 deletions.
114 changes: 61 additions & 53 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,48 @@ PATH
activity_notification (1.4.4)
i18n (>= 0.5.0)
jquery-rails (>= 3.1.1)
railties (>= 4.2.0, < 5.2)
railties (>= 4.2.0, < 5.3)

GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
actioncable (5.2.0)
actionpack (= 5.2.0)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
websocket-driver (>= 0.6.1)
actionmailer (5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
actionview (5.2.0)
activesupport (= 5.2.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
activejob (5.2.0)
activesupport (= 5.2.0)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activestorage (5.2.0)
actionpack (= 5.2.0)
activerecord (= 5.2.0)
marcel (~> 0.3.1)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -50,9 +54,9 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec-rails (>= 2.2)
arel (8.0.0)
aws-partitions (1.76.0)
aws-sdk-core (3.18.1)
arel (9.0.0)
aws-partitions (1.83.0)
aws-sdk-core (3.20.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
Expand All @@ -73,7 +77,7 @@ GEM
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
crass (1.0.3)
crass (1.0.4)
devise (4.4.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -82,10 +86,10 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.1.5)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
dotenv (2.4.0)
dotenv-rails (2.4.0)
dotenv (= 2.4.0)
railties (>= 3.2, < 6.0)
erubi (1.7.1)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
Expand All @@ -94,10 +98,10 @@ GEM
railties (>= 3.0.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (1.0.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
jmespath (1.3.1)
jquery-rails (4.3.1)
jmespath (1.4.0)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand All @@ -107,35 +111,39 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.2)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
mongo (2.5.1)
mongo (2.5.3)
bson (>= 4.3.0, < 5.0.0)
mongoid (7.0.0)
mongoid (7.0.1)
activemodel (>= 5.1, < 6.0.0)
mongo (>= 2.5.1, < 3.0.0)
mysql2 (0.5.0)
nio4r (2.3.0)
mysql2 (0.5.1)
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
pg (1.0.0)
rack (2.0.4)
rack (2.0.5)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
rails (5.2.0)
actioncable (= 5.2.0)
actionmailer (= 5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
activemodel (= 5.2.0)
activerecord (= 5.2.0)
activestorage (= 5.2.0)
activesupport (= 5.2.0)
bundler (>= 1.3.0)
railties (= 5.1.6)
railties (= 5.2.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
Expand All @@ -146,9 +154,9 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand Down Expand Up @@ -198,7 +206,7 @@ GEM
uniform_notifier (1.11.0)
warden (1.2.7)
rack (>= 1.0)
websocket-driver (0.6.5)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
yard (0.9.12)
Expand All @@ -218,7 +226,7 @@ DEPENDENCIES
dotenv-rails
factory_bot_rails (~> 4.8.2)
mongoid (>= 4.0.0)
mysql2 (~> 0.5.0)
mysql2 (~> 0.5.1)
pg (~> 1.0.0)
rails (~> 5.1)
rails-controller-testing
Expand Down
4 changes: 2 additions & 2 deletions activity_notification.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.required_ruby_version = '>= 2.1.0'

s.add_dependency 'railties', '>= 4.2.0', '< 5.2'
s.add_dependency 'railties', '>= 4.2.0', '< 5.3'
s.add_dependency 'i18n', '>= 0.5.0'
s.add_dependency 'jquery-rails', '>= 3.1.1'

s.add_development_dependency 'sqlite3', '~> 1.3.13'
s.add_development_dependency 'mysql2', '~> 0.5.0'
s.add_development_dependency 'mysql2', '~> 0.5.1'
s.add_development_dependency 'pg', '~> 1.0.0'
s.add_development_dependency 'mongoid', '>= 4.0.0'
s.add_development_dependency 'rspec-rails', '~> 3.7.2'
Expand Down
28 changes: 14 additions & 14 deletions gemfiles/Gemfile.rails-4.2.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PATH
activity_notification (1.4.4)
i18n (>= 0.5.0)
jquery-rails (>= 3.1.1)
railties (>= 4.2.0, < 5.2)
railties (>= 4.2.0, < 5.3)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -48,8 +48,8 @@ GEM
railties (>= 3.0)
rspec-rails (>= 2.2)
arel (6.0.4)
aws-partitions (1.76.0)
aws-sdk-core (3.18.1)
aws-partitions (1.83.0)
aws-sdk-core (3.20.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
Expand All @@ -70,7 +70,7 @@ GEM
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
crass (1.0.3)
crass (1.0.4)
devise (4.4.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -79,10 +79,10 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.1.5)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
dotenv (2.4.0)
dotenv-rails (2.4.0)
dotenv (= 2.4.0)
railties (>= 3.2, < 6.0)
erubis (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
Expand All @@ -93,8 +93,8 @@ GEM
activesupport (>= 4.2.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jmespath (1.3.1)
jquery-rails (4.3.1)
jmespath (1.4.0)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand All @@ -107,11 +107,11 @@ GEM
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
mongo (2.5.1)
mongo (2.5.3)
bson (>= 4.3.0, < 5.0.0)
mongoid (5.2.1)
mongoid (5.4.0)
activemodel (~> 4.0)
mongo (>= 2.4.1, < 3.0.0)
mongo (>= 2.5.1, < 3.0.0)
origin (~> 2.3)
tzinfo (>= 0.3.37)
mysql2 (0.4.10)
Expand All @@ -120,7 +120,7 @@ GEM
origin (2.3.1)
orm_adapter (0.5.0)
pg (0.21.0)
rack (1.6.9)
rack (1.6.10)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.10)
Expand Down
32 changes: 16 additions & 16 deletions gemfiles/Gemfile.rails-5.0.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PATH
activity_notification (1.4.4)
i18n (>= 0.5.0)
jquery-rails (>= 3.1.1)
railties (>= 4.2.0, < 5.2)
railties (>= 4.2.0, < 5.3)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -51,8 +51,8 @@ GEM
railties (>= 3.0)
rspec-rails (>= 2.2)
arel (7.1.4)
aws-partitions (1.76.0)
aws-sdk-core (3.18.1)
aws-partitions (1.83.0)
aws-sdk-core (3.20.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
Expand All @@ -73,7 +73,7 @@ GEM
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
crass (1.0.3)
crass (1.0.4)
devise (4.4.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -82,10 +82,10 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.1.5)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
dotenv (2.4.0)
dotenv-rails (2.4.0)
dotenv (= 2.4.0)
railties (>= 3.2, < 6.0)
erubis (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
Expand All @@ -94,10 +94,10 @@ GEM
railties (>= 3.0.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (1.0.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
jmespath (1.3.1)
jquery-rails (4.3.1)
jmespath (1.4.0)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand All @@ -111,18 +111,18 @@ GEM
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
mongo (2.5.1)
mongo (2.5.3)
bson (>= 4.3.0, < 5.0.0)
mongoid (6.1.1)
activemodel (~> 5.0)
mongo (>= 2.4.1, < 3.0.0)
mysql2 (0.5.0)
nio4r (2.3.0)
mysql2 (0.5.1)
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
pg (1.0.0)
rack (2.0.4)
rack (2.0.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7)
Expand Down Expand Up @@ -218,7 +218,7 @@ DEPENDENCIES
dotenv-rails
factory_bot_rails (~> 4.8.2)
mongoid (>= 4.0.0)
mysql2 (~> 0.5.0)
mysql2 (~> 0.5.1)
pg (~> 1.0.0)
rails (~> 5.0.0)
rails-controller-testing
Expand Down
Loading

0 comments on commit a6ade8f

Please sign in to comment.