Skip to content

Commit

Permalink
Merge pull request #172 from travis-ci/ha-bundle-update
Browse files Browse the repository at this point in the history
Update gems
  • Loading branch information
BanzaiMan authored Apr 3, 2019
2 parents 255105d + 3dbfa44 commit da14b47
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.2
2.5.3
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
language: ruby

rvm: 2.4.2

services:
- redis-server

Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.4.2'
ruby '2.5.3'

gem 'travis-logger', git: 'https://github.com/travis-ci/travis-logger'
gem 'travis-exceptions', git: 'https://github.com/travis-ci/travis-exceptions'
Expand All @@ -20,9 +20,9 @@ gem 'jemalloc', git: 'https://github.com/joshk/jemalloc-rb'

gem 'gh'
gem 'aws-sdk'
gem 'actionmailer'
gem 'actionmailer', '>= 5.2.2.1'
gem 'roadie'
gem 'roadie-rails', '~> 1.0'
gem 'roadie-rails', '~> 2.0'
gem 'multi_json'

gem 'faraday'
Expand Down
60 changes: 30 additions & 30 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@ GEM
remote: https://rubygems.org/
specs:
HDRHistogram (0.1.9)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
actionview (5.2.3)
activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activesupport (5.2.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -683,15 +683,15 @@ GEM
backports (3.11.4)
builder (3.2.3)
coderay (1.1.2)
concurrent-ruby (1.1.4)
concurrent-ruby (1.1.5)
connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
css_parser (1.6.0)
addressable
diff-lcs (1.3)
erubi (1.7.1)
erubi (1.8.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
Expand All @@ -707,7 +707,7 @@ GEM
multi_json (~> 1.0)
net-http-persistent (~> 2.9)
net-http-pipeline
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.14.2)
formatador (>= 0.2.4)
Expand All @@ -725,7 +725,7 @@ GEM
rspec (>= 2.99.0, < 4.0)
hashr (2.0.1)
hitimes (1.3.0)
i18n (1.2.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
jwt (2.1.0)
Expand All @@ -744,7 +744,7 @@ GEM
metaclass (0.0.4)
method_source (0.9.0)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
mocha (0.10.5)
metaclass (~> 0.0.1)
Expand All @@ -753,29 +753,29 @@ GEM
nenv (0.3.0)
net-http-persistent (2.9.4)
net-http-pipeline (1.0.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
rack (2.0.6)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
Expand All @@ -785,8 +785,8 @@ GEM
roadie (3.4.0)
css_parser (~> 1.4)
nokogiri (~> 1.5)
roadie-rails (1.3.0)
railties (>= 3.0, < 5.3)
roadie-rails (2.0.0)
railties (>= 5.1, < 5.3)
roadie (~> 3.1)
rspec (3.8.0)
rspec-core (~> 3.8.0)
Expand Down Expand Up @@ -824,7 +824,7 @@ PLATFORMS
ruby

DEPENDENCIES
actionmailer
actionmailer (>= 5.2.2.1)
aws-sdk
faraday
faraday_middleware
Expand All @@ -840,7 +840,7 @@ DEPENDENCIES
multi_json
redis-namespace
roadie
roadie-rails (~> 1.0)
roadie-rails (~> 2.0)
rspec (~> 3.8)
sentry-raven
sidekiq (~> 4.0.0)
Expand All @@ -852,7 +852,7 @@ DEPENDENCIES
webmock (~> 1.8.0)

RUBY VERSION
ruby 2.4.2p198
ruby 2.5.3p105

BUNDLED WITH
1.17.1
1.17.3

0 comments on commit da14b47

Please sign in to comment.