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

Merge branch 'master' into api-dev

Browse Source
This commit is contained in:
Alberto Miedes Garcés
2016-12-03 13:53:13 +01:00
parent 6013f84945 dd406cfeb0
commit fdea4ad6ac
69 changed files with 1408 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@@ -32,7 +32,7 @@ gem 'omniauth-facebook', '~> 3.0.0'
gem 'omniauth-google-oauth2', '~> 0.4.0'
gem 'kaminari'
gem 'ancestry', '~> 2.2.1'
gem 'ancestry', '~> 2.2.2'
gem 'acts-as-taggable-on'
gem 'responders', '~> 2.3.0'
gem 'foundation-rails', '~> 6.2.4.0'
@@ -55,6 +55,7 @@ gem 'devise-async'
gem 'newrelic_rpm', '~> 3.17.0.325'
gem 'whenever', require: false
gem 'pg_search'
gem 'sitemap_generator'
gem 'ahoy_matey', '~> 1.4.2'
gem 'groupdate', '~> 3.1.0' # group temporary data
@@ -82,13 +83,14 @@ group :development, :test do
gem 'letter_opener_web', '~> 1.3.0'
gem 'i18n-tasks'
gem 'capistrano', '3.5.0', require: false
gem "capistrano-bundler", '1.1.4', require: false
gem 'capistrano-bundler', '~> 1.2', require: false
gem "capistrano-rails", '1.1.8', require: false
gem "capistrano-rvm", require: false
gem 'rvm1-capistrano3', require: false
gem 'capistrano3-delayed-job', '~> 1.0'
gem "bullet"
gem "faker"
gem 'rubocop', '~> 0.45.0', require: false
gem 'knapsack'
end
group :test do