Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
blms committed Jul 14, 2022
2 parents e009b80 + 31c7a88 commit eccdb50
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
2.7.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM ruby:2.7.4 AS dm2-dev
FROM ruby:2.7.6 AS dm2-dev

# Install node.js and yarn
RUN apt-get update -qq && apt-get install -y curl sudo
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

ruby '2.7.4'
ruby '2.7.6'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ DEPENDENCIES
tzinfo-data

RUBY VERSION
ruby 2.7.4p191
ruby 2.7.6p219

BUNDLED WITH
2.2.26
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ docker-compose down

#### Requirements

- Ruby 2.7.4
- Ruby 2.7.6
- Bundler 2.2.26+
- PostgreSQL 11.12+
- Node.js 16.x
Expand Down

0 comments on commit eccdb50

Please sign in to comment.