diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
| commit | d8fdbb054e30f6e8e505bce63e5f150bf117cd8e (patch) | |
| tree | 0a671ee6c8a7644e6613dd87798f661f4703e8fe /Gemfile | |
| parent | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (diff) | |
| parent | 65db2625508c220fd3c0a1f37cdd2e13b6e02987 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied 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 5fa7076e0..9e63abd44 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'makara', '~> 0.5' gem 'pghero', '~> 2.7' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.88', require: false +gem 'aws-sdk-s3', '~> 1.89', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -48,7 +48,7 @@ gem 'omniauth-rails_csrf_protection', '~> 0.1' gem 'color_diff', '~> 0.1' gem 'discard', '~> 1.2' -gem 'doorkeeper', '~> 5.4' +gem 'doorkeeper', '~> 5.5' gem 'ed25519', '~> 1.2' gem 'fast_blank', '~> 1.0' gem 'fastimage' @@ -93,7 +93,7 @@ gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' gem 'stoplight', '~> 2.2.1' gem 'strong_migrations', '~> 0.7' gem 'tty-prompt', '~> 0.23', require: false -gem 'twitter-text', '~> 1.14' +gem 'twitter-text', '~> 3.1.0' gem 'tzinfo-data', '~> 1.2021' gem 'webpacker', '~> 5.2' gem 'webpush' @@ -126,7 +126,7 @@ group :test do gem 'rails-controller-testing', '~> 1.0' gem 'rspec-sidekiq', '~> 3.1' gem 'simplecov', '~> 0.21', require: false - gem 'webmock', '~> 3.11' + gem 'webmock', '~> 3.12' gem 'parallel_tests', '~> 3.4' gem 'rspec_junit_formatter', '~> 0.4' end |