diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-16 23:10:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 23:10:12 +0200 |
| commit | 4bf43e6f3e93643d989a2872763b41505fab2206 (patch) | |
| tree | e1b781fe4fae9d02284e5e836338cc598431413f /Gemfile | |
| parent | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff) | |
| parent | 78ac246b877072bb5f94da34d29612fafde3a8ae (diff) | |
Merge pull request #486 from ThibG/glitch-soc/merge-upstream
Merge changes from upstream
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 0ead19733..aba3fa024 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,6 @@ gem 'fog-local', '~> 0.5', require: false gem 'fog-openstack', '~> 0.1', require: false gem 'paperclip', '~> 6.0' gem 'paperclip-av-transcoder', '~> 0.6' -gem 'posix-spawn', '~> 0.3' gem 'streamio-ffmpeg', '~> 3.0' gem 'active_model_serializers', '~> 0.10' @@ -63,6 +62,7 @@ gem 'nsa', '~> 0.2' gem 'oj', '~> 3.5' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.9' +gem 'posix-spawn', '0.3.12' gem 'pundit', '~> 1.1' gem 'premailer-rails' gem 'rack-attack', '~> 5.2' |