diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-11 21:28:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 21:28:03 +0200 |
| commit | 00759642446c41c9e9c428010ed0d3d3b79703bb (patch) | |
| tree | f8cc02c4034d2436ea849a4f313c42eabc51a808 /Gemfile | |
| parent | bb1103d9742f088252f8156968a474ca8a58b087 (diff) | |
| parent | 8f720be9f3ad314f0c0b0c7c0cc81616ba20e8fd (diff) | |
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile index d77a29b79..b417a8d2e 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'hamlit-rails', '~> 0.2' gem 'pg', '~> 1.1' gem 'makara', '~> 0.4' gem 'pghero', '~> 2.2' -gem 'dotenv-rails', '~> 2.2', '< 2.3' +gem 'dotenv-rails', '~> 2.5' gem 'aws-sdk-s3', '~> 1.21', require: false gem 'fog-core', '~> 2.1' @@ -109,7 +109,7 @@ end group :test do gem 'capybara', '~> 3.9' gem 'climate_control', '~> 0.2' - gem 'faker', '~> 1.8' + gem 'faker', '~> 1.9' gem 'microformats', '~> 4.0' gem 'rails-controller-testing', '~> 1.0' gem 'rspec-sidekiq', '~> 3.0' @@ -121,7 +121,7 @@ end group :development do gem 'active_record_query_trace', '~> 1.5' gem 'annotate', '~> 2.7' - gem 'better_errors', '~> 2.4' + gem 'better_errors', '~> 2.5' gem 'binding_of_caller', '~> 0.7' gem 'bullet', '~> 5.7' gem 'letter_opener', '~> 1.4' @@ -133,7 +133,7 @@ group :development do gem 'scss_lint', '~> 0.57', require: false gem 'capistrano', '~> 3.11' - gem 'capistrano-rails', '~> 1.3' + gem 'capistrano-rails', '~> 1.4' gem 'capistrano-rbenv', '~> 2.1' gem 'capistrano-yarn', '~> 2.0' |