diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
| commit | 24968d20a07d483cd36b4747bd1db8bd512002c2 (patch) | |
| tree | d306d08bc32edba292cf9aa85c3be8ba009c1b1c /Gemfile | |
| parent | f48c7689d230b915ed740a4774736bd5998cbc66 (diff) | |
| parent | b31b232edfcc7f04acf828bf6829ab716b290692 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile index cc4830273..1cf1ee379 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.2' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.45', require: false +gem 'aws-sdk-s3', '~> 1.46', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -53,7 +53,7 @@ gem 'html2text' gem 'htmlentities', '~> 4.3' gem 'http', '~> 3.3' gem 'http_accept_language', '~> 2.1' -gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2' +gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true gem 'httplog', '~> 1.3' gem 'idn-ruby', require: 'idn' gem 'kaminari', '~> 1.1' @@ -113,7 +113,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.26' + gem 'capybara', '~> 3.27' gem 'climate_control', '~> 0.2' gem 'faker', '~> 1.9' gem 'microformats', '~> 4.1' @@ -135,7 +135,7 @@ group :development do gem 'memory_profiler' gem 'rubocop', '~> 0.73', require: false gem 'rubocop-rails', '~> 2.2', require: false - gem 'brakeman', '~> 4.5', require: false + gem 'brakeman', '~> 4.6', require: false gem 'bundler-audit', '~> 0.6', require: false gem 'capistrano', '~> 3.11' |