Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rails 5.1 - Dual Boot - remove version constraints and update next? dual boot to run rails 5.1 #358

Merged
merged 2 commits into from
Aug 14, 2024
Merged

Rails 5.1 - Dual Boot - remove version constraints and update next? dual boot to run rails 5.1 #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9666b7
remove version constraints and update next? dual boot to run rails 5.1
yuenmichelle1 Aug 12, 2024
a16eb7c
remove version constraint for dev dependency spring
yuenmichelle1 Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ end
source 'https://rubygems.org'

if next?
gem 'rails', '5.0.7.2'
gem 'schema_plus_pg_indexes', '~> 0.2.1'
gem 'spring', '~> 2.0.2', group: :development
gem 'rails', '5.1.7'
else
gem 'rails', '5.0.7.2'
gem 'schema_plus_pg_indexes', '~> 0.2.1'
gem 'spring', '~> 2.0.2', group: :development
end

gem 'aws-sdk', '~> 2.3.7'
Expand All @@ -27,24 +23,23 @@ gem 'pundit', '~> 1.1.0'
gem 'rack-cors', '~> 1.0.5'
gem 'redis', '~> 3.3.0'
gem 'restpack_serializer', git: 'https://github.com/zooniverse/restpack_serializer.git', branch: 'talk-api-version', ref: '637aaaf85e'
gem 'schema_plus_pg_indexes'
gem 'sidekiq', '< 6'
gem 'sidekiq-congestion', '~> 0.1.0'
gem 'sidekiq-cron'
gem 'spring', group: :development
gem 'zoo_stream', '~> 1.0'

group :test, :development do
if next?
gem 'rspec-rails', '~> 4.1.2'
else
gem 'rspec-rails', '~> 4.1.2'
end
gem 'benchmark-ips'
gem 'factory_girl_rails', '~> 4.7.0'
gem 'guard', '~> 2.14.0'
gem 'guard-rspec', '~> 4.6.5'
gem 'pry', '~> 0.11.3'
gem 'rspec-its', '~> 1.2.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'factory_girl_rails'
gem 'ffi', '1.16.3'
gem 'guard'
gem 'guard-rspec'
gem 'pry'
gem 'rspec-its'
gem 'rspec-rails'
gem 'spring-commands-rspec'
gem 'ten_years_rails'
gem 'timecop'
end
Expand Down
62 changes: 31 additions & 31 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ GEM
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.3)
colorize (1.1.0)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
congestion (0.1.0)
connection_pool (>= 2.0)
redis (>= 3.1)
Expand All @@ -83,10 +83,10 @@ GEM
erubis (2.7.0)
et-orbi (1.2.11)
tzinfo
factory_girl (4.7.0)
factory_girl (4.9.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
railties (>= 3.0.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
Expand All @@ -106,7 +106,7 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
Expand All @@ -120,21 +120,21 @@ GEM
raabro (~> 1.4)
globalid (1.1.0)
activesupport (>= 5.0)
guard (2.14.2)
guard (2.18.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
pry (>= 0.13.0)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-rspec (4.6.5)
guard-rspec (4.7.3)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hashdiff (1.1.0)
hashdiff (1.1.1)
honeybadger (4.5.6)
http-accept (1.7.0)
http-cookie (1.0.6)
Expand Down Expand Up @@ -180,10 +180,10 @@ GEM
net-imap
net-pop
net-smtp
method_source (0.9.2)
method_source (1.1.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0702)
mime-types-data (3.2024.0806)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.24.1)
Expand All @@ -203,7 +203,7 @@ GEM
net-smtp (0.5.0)
net-protocol
netrc (0.11.0)
newrelic_rpm (9.11.0)
newrelic_rpm (9.12.0)
nio4r (2.7.3)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
Expand All @@ -212,16 +212,16 @@ GEM
nenv (~> 0.1)
shellany (~> 0.0)
pg (0.21.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.1.1)
puma (6.4.2)
nio4r (~> 2.0)
pundit (1.1.0)
activesupport (>= 3.0.0)
raabro (1.4.0)
racc (1.8.0)
racc (1.8.1)
rack (2.2.9)
rack-cors (1.0.6)
rack (>= 1.6.0)
Expand Down Expand Up @@ -266,7 +266,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.2)
rexml (3.3.5)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
Expand All @@ -277,7 +277,7 @@ GEM
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-its (1.2.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.13.1)
Expand All @@ -304,8 +304,8 @@ GEM
activerecord (>= 4.2, < 5.3)
its-it (~> 1.2)
schema_plus_core
schema_plus_pg_indexes (0.2.1)
activerecord (~> 5.0, >= 5.0.1)
schema_plus_pg_indexes (0.3.2)
activerecord (>= 5.0.1, < 5.3)
its-it (~> 1.2)
schema_plus_core (~> 2.0)
schema_plus_indexes (~> 0.2, >= 0.2.4)
Expand All @@ -326,8 +326,7 @@ GEM
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
spring (3.1.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (4.2.1)
Expand Down Expand Up @@ -369,34 +368,35 @@ DEPENDENCIES
aws-sdk (~> 2.3.7)
benchmark-ips
codeclimate-test-reporter (~> 0.5)
factory_girl_rails (~> 4.7.0)
factory_girl_rails
faraday
faraday_middleware
guard (~> 2.14.0)
guard-rspec (~> 4.6.5)
ffi (= 1.16.3)
guard
guard-rspec
honeybadger (~> 4.5.0)
json-schema (~> 2.8)
json-schema_builder (~> 0.0.8)
logstasher (~> 0.9.0)
mock_redis
newrelic_rpm
pg (~> 0.21)
pry (~> 0.11.3)
pry
puma
pundit (~> 1.1.0)
rack-cors (~> 1.0.5)
rails (= 5.0.7.2)
redis (~> 3.3.0)
restpack_serializer!
rspec-its (~> 1.2.0)
rspec-rails (~> 4.1.2)
schema_plus_pg_indexes (~> 0.2.1)
rspec-its
rspec-rails
schema_plus_pg_indexes
sidekiq (< 6)
sidekiq-congestion (~> 0.1.0)
sidekiq-cron
simplecov (~> 0.11.2)
spring (~> 2.0.2)
spring-commands-rspec (~> 1.0.4)
spring
spring-commands-rspec
ten_years_rails
timecop
webmock (~> 3.4)
Expand Down
Loading
Loading