diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
tree | a8a0df2129a863a739dda6399352d64af811110e /Gemfile | |
parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile index d904f5176..015a4d577 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.3' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.52', require: false +gem 'aws-sdk-s3', '~> 1.55', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -68,11 +68,11 @@ gem 'oj', '~> 3.9' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.11' gem 'parslet' -gem 'parallel', '~> 1.17' +gem 'parallel', '~> 1.18' gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' gem 'pundit', '~> 2.1' gem 'premailer-rails' -gem 'rack-attack', '~> 6.1' +gem 'rack-attack', '~> 6.2' gem 'rack-cors', '~> 1.0', require: 'rack/cors' gem 'rails-i18n', '~> 5.1' gem 'rails-settings-cached', '~> 0.6' @@ -88,7 +88,7 @@ gem 'sidekiq-bulk', '~>0.2.0' gem 'simple-navigation', '~> 4.1' gem 'simple_form', '~> 5.0' gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' -gem 'stoplight', '~> 2.1.3' +gem 'stoplight', '~> 2.2.0' gem 'strong_migrations', '~> 0.4' gem 'tty-command', '~> 0.9', require: false gem 'tty-prompt', '~> 0.19', require: false @@ -105,7 +105,7 @@ gem 'redcarpet', '~> 3.4' group :development, :test do gem 'fabrication', '~> 2.20' - gem 'fuubar', '~> 2.4' + gem 'fuubar', '~> 2.5' gem 'i18n-tasks', '~> 0.9', require: false gem 'pry-byebug', '~> 3.7' gem 'pry-rails', '~> 0.3' @@ -119,7 +119,7 @@ end group :test do gem 'capybara', '~> 3.29' gem 'climate_control', '~> 0.2' - gem 'faker', '~> 2.6' + gem 'faker', '~> 2.7' gem 'microformats', '~> 4.1' gem 'rails-controller-testing', '~> 1.0' gem 'rspec-sidekiq', '~> 3.0' @@ -137,9 +137,9 @@ group :development do gem 'letter_opener', '~> 1.7' gem 'letter_opener_web', '~> 1.3' gem 'memory_profiler' - gem 'rubocop', '~> 0.75', require: false + gem 'rubocop', '~> 0.76', require: false gem 'rubocop-rails', '~> 2.3', require: false - gem 'brakeman', '~> 4.6', require: false + gem 'brakeman', '~> 4.7', require: false gem 'bundler-audit', '~> 0.6', require: false gem 'capistrano', '~> 3.11' |