Skip to content

Commit

Permalink
Merge pull request #822 from tdiary/update_ruby
Browse files Browse the repository at this point in the history
update ruby to 2.6.5 on Heroku and update bundles
  • Loading branch information
tdtds committed Oct 3, 2019
2 parents a9c6693 + 2f395b8 commit 41e906f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ services: memcache

rvm:
- 2.4.7
- 2.5.6
- 2.6.4
- 2.5.7
- 2.6.5
- ruby-head

matrix:
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ GEM
docile (1.3.2)
emot (0.0.4)
thor
faraday (0.15.4)
faraday (0.16.2)
multipart-post (>= 1.2, < 3)
fastimage (2.1.7)
hikidoc (0.1.0)
Expand Down Expand Up @@ -88,14 +88,14 @@ GEM
rspec-support (3.8.2)
ruby-debug-ide (0.7.0)
rake (>= 0.8.1)
rubyzip (1.3.0)
rubyzip (2.0.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
selenium-webdriver (3.142.4)
selenium-webdriver (3.142.5)
childprocess (>= 0.5, < 3.0)
rubyzip (~> 1.2, >= 1.2.2)
sequel (5.24.0)
rubyzip (>= 1.2.2)
sequel (5.25.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand All @@ -104,7 +104,7 @@ GEM
sqlite3 (1.4.1)
term-ansicolor (1.7.1)
tins (~> 1.0)
test-unit (3.3.3)
test-unit (3.3.4)
power_assert
thor (0.20.3)
tins (1.21.1)
Expand Down
2 changes: 1 addition & 1 deletion misc/paas/heroku/Gemfile.local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ruby '~> 2.6.4'
ruby '~> 2.6.5'
gem 'puma', require: false
gem 'tdiary-io-mongodb', git: 'https://github.com/tdiary/tdiary-io-mongodb.git'
gem 'tdiary-contrib', git: 'https://github.com/tdiary/tdiary-contrib.git'
Expand Down
16 changes: 8 additions & 8 deletions misc/paas/heroku/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ GEM
docile (1.3.2)
emot (0.0.4)
thor
faraday (0.15.4)
faraday (0.16.2)
multipart-post (>= 1.2, < 3)
fastimage (2.1.7)
hashie (3.6.0)
Expand All @@ -85,7 +85,7 @@ GEM
mime-types-data (3.2019.0904)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.0)
minitest (5.12.2)
mongo (2.8.0)
bson (>= 4.4.2, < 5.0.0)
mongoid (7.0.5)
Expand Down Expand Up @@ -149,14 +149,14 @@ GEM
rake (>= 0.8.1)
ruby-enum (0.7.2)
i18n
rubyzip (1.3.0)
rubyzip (2.0.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
selenium-webdriver (3.142.4)
selenium-webdriver (3.142.5)
childprocess (>= 0.5, < 3.0)
rubyzip (~> 1.2, >= 1.2.2)
sequel (5.24.0)
rubyzip (>= 1.2.2)
sequel (5.25.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand All @@ -180,7 +180,7 @@ GEM
rdtool
term-ansicolor (1.7.1)
tins (~> 1.0)
test-unit (3.3.3)
test-unit (3.3.4)
power_assert
thor (0.20.3)
thread_safe (0.3.6)
Expand Down Expand Up @@ -236,7 +236,7 @@ DEPENDENCIES
test-unit

RUBY VERSION
ruby 2.6.4p104
ruby 2.6.5p114

BUNDLED WITH
2.0.2

0 comments on commit 41e906f

Please sign in to comment.