diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-24 19:17:11 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-24 19:17:11 +0000 |
| commit | 0e10667fbe8b565b05dd2f34c3ee14bed7f36967 (patch) | |
| tree | 272ee0087b95e4f2dfeb08243bbeb60cc5d8a651 /Gemfile | |
| parent | 1b4d79acf8a0667b15a6835479d2cae0c2de5612 (diff) | |
| parent | a3c0a2037314f105e807f9ede4210066a1524229 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index dc72851b3..ba9095378 100644 --- a/Gemfile +++ b/Gemfile @@ -33,11 +33,11 @@ gem 'devise', '~> 4.4' gem 'devise-two-factor', '~> 3.0' gem 'doorkeeper', '~> 4.2' gem 'fast_blank', '~> 1.0' -gem 'goldfinger', '~> 2.0' +gem 'goldfinger', '~> 2.1' gem 'hiredis', '~> 0.6' gem 'redis-namespace', '~> 1.5' gem 'htmlentities', '~> 4.3' -gem 'http', '~> 2.2' +gem 'http', '~> 3.0' gem 'http_accept_language', '~> 2.1' gem 'httplog', '~> 0.99' gem 'idn-ruby', require: 'idn' |