Skip to content

Commit

Permalink
Merge branch 'master' into feat/action-cable-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcotc
marcotc committed Dec 20, 2019
2 parents 45287e0 + 6ae74f4 commit 3f8dd7a
Show file tree
Hide file tree
Showing 128 changed files with 1,773 additions and 1,839 deletions.
832 changes: 289 additions & 543 deletions .circleci/config.yml
View file

Large diffs are not rendered by default.

92 changes: 40 additions & 52 deletions Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,21 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
end

appraise 'rails4-mysql2' do
gem 'rails', '4.2.7.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'rails', '4.2.11.1'
gem 'mysql2', '< 1', platform: :ruby
gem 'activerecord-jdbcmysql-adapter', platform: :jruby
gem 'sprockets', '< 4'
end

appraise 'rails4-postgres' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'sprockets', '< 4'
end

appraise 'rails4-postgres-redis' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'redis-rails'
Expand Down Expand Up @@ -259,21 +259,21 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
end

appraise 'rails4-mysql2' do
gem 'rails', '4.2.7.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'rails', '4.2.11.1'
gem 'mysql2', '< 1', platform: :ruby
gem 'activerecord-jdbcmysql-adapter', platform: :jruby
gem 'sprockets', '< 4'
end

appraise 'rails4-postgres' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'sprockets', '< 4'
end

appraise 'rails4-postgres-redis' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'redis-rails'
Expand All @@ -282,7 +282,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
end

appraise 'rails4-postgres-sidekiq' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'sidekiq'
Expand All @@ -291,34 +291,33 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
end

appraise 'rails5-mysql2' do
gem 'rails', '~> 5.2.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
gem 'mysql2', '< 1', platform: :ruby
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres' do
gem 'rails', '~> 5.2.1'
gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres-redis' do
gem 'rails', '~> 5.2.1'
gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres-redis-activesupport' do
gem 'rails', '~> 5.2.1'
gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres-sidekiq' do
gem 'rails', '~> 5.2.1'
gem 'rails', '~> 5.2.1', '!= 5.2.4.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'sidekiq'
gem 'activejob'
Expand Down Expand Up @@ -418,21 +417,21 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
end

appraise 'rails4-mysql2' do
gem 'rails', '4.2.7.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'rails', '4.2.11.1'
gem 'mysql2', '< 1', platform: :ruby
gem 'activerecord-jdbcmysql-adapter', platform: :jruby
gem 'sprockets', '< 4'
end

appraise 'rails4-postgres' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'sprockets', '< 4'
end

appraise 'rails4-postgres-redis' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'redis-rails'
Expand All @@ -441,7 +440,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
end

appraise 'rails4-postgres-sidekiq' do
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.11.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'sidekiq'
Expand All @@ -451,7 +450,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \

appraise 'rails5-mysql2' do
gem 'rails', '~> 5.2.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'mysql2', '< 1', platform: :ruby
gem 'sprockets', '< 4'
end

Expand All @@ -464,15 +463,14 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
appraise 'rails5-postgres-redis' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres-redis-activesupport' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

Expand Down Expand Up @@ -525,7 +523,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
if RUBY_PLATFORM != 'java'
appraise 'rails5-mysql2' do
gem 'rails', '~> 5.2.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'mysql2', '< 1', platform: :ruby
gem 'sprockets', '< 4'
end

Expand All @@ -538,16 +536,14 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
appraise 'rails5-postgres-redis' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres-redis-activesupport' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

Expand Down Expand Up @@ -600,7 +596,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
if RUBY_PLATFORM != 'java'
appraise 'rails5-mysql2' do
gem 'rails', '~> 5.2.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'mysql2', '< 1', platform: :ruby
gem 'sprockets', '< 4'
end

Expand All @@ -613,16 +609,14 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
appraise 'rails5-postgres-redis' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres-redis-activesupport' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

Expand All @@ -636,7 +630,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \

appraise 'rails6-mysql2' do
gem 'rails', '~> 6.0.0'
gem 'mysql2', '< 0.6', platform: :ruby
gem 'mysql2', '< 1', platform: :ruby
gem 'sprockets', '< 4'
end

Expand All @@ -649,16 +643,14 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
appraise 'rails6-postgres-redis' do
gem 'rails', '~> 6.0.0'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails6-postgres-redis-activesupport' do
gem 'rails', '~> 6.0.0'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

Expand Down Expand Up @@ -710,7 +702,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
if RUBY_PLATFORM != 'java'
appraise 'rails5-mysql2' do
gem 'rails', '~> 5.2.1'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'mysql2', '< 1', platform: :ruby
gem 'sprockets', '< 4'
end

Expand All @@ -723,16 +715,14 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
appraise 'rails5-postgres-redis' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails5-postgres-redis-activesupport' do
gem 'rails', '~> 5.2.1'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

Expand All @@ -746,7 +736,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)

appraise 'rails6-mysql2' do
gem 'rails', '~> 6.0.0'
gem 'mysql2', '< 0.6', platform: :ruby
gem 'mysql2', '< 1', platform: :ruby
gem 'sprockets', '< 4'
end

Expand All @@ -759,16 +749,14 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
appraise 'rails6-postgres-redis' do
gem 'rails', '~> 6.0.0'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

appraise 'rails6-postgres-redis-activesupport' do
gem 'rails', '~> 6.0.0'
gem 'pg', '< 1.0', platform: :ruby
gem 'redis-rails'
gem 'redis'
gem 'redis', '>= 4.0.1'
gem 'sprockets', '< 4'
end

Expand Down
Loading

0 comments on commit 3f8dd7a

Please sign in to comment.