From ce29624c6df83699a01808d68c19a2492864ffe8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 12 Sep 2016 18:22:43 +0200
Subject: Fixing image upload limits, allowing webm, merge/unmerge events
 trigger timeline reload in UI, other small fixes

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index eff16be54..8bb337a6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,7 @@ gem 'dotenv-rails'
 gem 'font-awesome-rails'
 
 gem 'paperclip', '~> 4.3'
+gem 'paperclip-av-transcoder'
 
 gem 'http'
 gem 'addressable'
@@ -31,12 +32,11 @@ gem 'hiredis'
 gem 'redis', '~>3.2'
 gem 'fast_blank'
 gem 'htmlentities'
-gem 'onebox'
 gem 'simple_form'
 gem 'will_paginate'
 gem 'rack-attack'
 gem 'sidekiq'
-gem 'sinatra', require: nil, github: 'sinatra'
+gem 'sinatra', require: nil, git: 'https://github.com/sinatra/sinatra.git'
 
 gem 'react-rails'
 gem 'browserify-rails'
-- 
cgit