diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
commit | 8ca91cef45417947607079118b1af07c9774ae58 (patch) | |
tree | cafbe6cc30563ca35ffa522056ead63ca450d9c1 /Gemfile | |
parent | f2f2f1032082d6212771bd0307136484f671d37e (diff) | |
parent | a0047fdca052088cce0e23c3b58b95f13be19805 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index d0b7aaef1..e43b1a256 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,6 @@ gem 'oj', '~> 3.3' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.8' gem 'pundit', '~> 1.1' -gem 'rabl', '~> 0.13' gem 'rack-attack', '~> 5.0' gem 'rack-cors', '~> 0.4', require: 'rack/cors' gem 'rack-timeout', '~> 0.4' |