diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 21:48:25 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 21:48:25 +0200 |
| commit | 98bb6815a774d6101cb0c6c909b4dba7599f2ef8 (patch) | |
| tree | a6083a4b16dfffcb49ed787a719ddcdb4741cc49 /Gemfile | |
| parent | c6e4c489425bd3b66a07d37f39e1678d69226fa8 (diff) | |
| parent | 144d73730de38da84d605f876157bc9bd45c25b4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 0c4d911c8..66b83cfa1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '>= 2.3.0', '< 2.6.0' gem 'pkg-config', '~> 1.3' -gem 'puma', '~> 3.11' +gem 'puma', '~> 3.12' gem 'rails', '~> 5.2.1' gem 'thor', '~> 0.20' @@ -117,7 +117,7 @@ group :test do gem 'rspec-sidekiq', '~> 3.0' gem 'simplecov', '~> 0.16', require: false gem 'webmock', '~> 3.4' - gem 'parallel_tests', '~> 2.21' + gem 'parallel_tests', '~> 2.23' end group :development do |