Fixing image upload limits, allowing webm, merge/unmerge events trigger

timeline reload in UI, other small fixes
This commit is contained in:
Eugen Rochko 2016-09-12 18:22:43 +02:00
parent 3d566279cb
commit ce29624c6d
15 changed files with 144 additions and 61 deletions

View file

@ -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'