consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into admin_password_expired

Browse Source
This commit is contained in:
Marcia
2016-09-27 13:26:08 +02:00
parent 78c6a30424 03dca699ac
commit 4269f3810b
53 changed files with 959 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@@ -19,6 +19,9 @@ gem 'jquery-ui-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Fix sprockets on the
gem 'sprockets', '~> 3.6.3'
gem 'devise', '~> 3.5.7'
gem 'devise_security_extension'
# Use ActiveModel has_secure_password
@@ -39,7 +42,7 @@ gem 'ckeditor', '~> 4.2.0'
gem 'invisible_captcha', '~> 0.9.1'
gem 'cancancan'
gem 'social-share-button'
gem 'initialjs-rails', '0.2.0.1'
gem 'initialjs-rails', '0.2.0.4'
gem 'unicorn', '~> 5.1.0'
gem 'paranoia'
gem 'rinku', require: 'rails_rinku'