Skip to content
This repository has been archived by the owner on Oct 10, 2022. It is now read-only.

Commit

Permalink
Merge pull request #365 from JunichiIto/update-gems
Browse files Browse the repository at this point in the history
Rubyバージョンとgemのアップデート
  • Loading branch information
JunichiIto committed Apr 12, 2020
2 parents 4ed8f6c + 429f490 commit 6103936
Show file tree
Hide file tree
Showing 5 changed files with 166 additions and 152 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.6.5
2.6.6
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.6.5
- 2.6.6
cache: bundler
bundler_args: --without production --deployment
addons:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM ruby:2.6.5
FROM ruby:2.6.6
ENV LANG C.UTF-8
LABEL maintainer 'Yuji Shimoda <yuji.shimoda@gmail.com>'

Expand All @@ -14,4 +14,4 @@ COPY Gemfile /app/Gemfile
COPY Gemfile.lock /app/Gemfile.lock
RUN bundle install
ENV DATABASE_HOST db
ENV DATABASE_USERNAME postgres
ENV DATABASE_USERNAME postgres
6 changes: 3 additions & 3 deletions Gemfile
@@ -1,8 +1,8 @@
source 'https://rubygems.org'

ruby '2.6.5'
ruby '2.6.6'

gem 'rails', '6.0.0'
gem 'rails', '6.0.2.2'

# UI/assets
gem 'uglifier'
Expand Down Expand Up @@ -49,7 +49,7 @@ group :development do
gem 'binding_of_caller'
gem 'spring'
gem 'letter_opener'
gem 'bundle_outdated_formatter'
gem 'bundle_outdated_formatter', github: 'JunichiIto/bundle_outdated_formatter', branch: 'fix-group-regex'
end

group :development, :test do
Expand Down

0 comments on commit 6103936

Please sign in to comment.