Merge branch 'master' into legislation-module-stable

This commit is contained in:
Amaia Castro
2017-03-17 18:08:22 +01:00
24 changed files with 271 additions and 179 deletions

40
Gemfile
View File

@@ -1,13 +1,13 @@
source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7.1'
gem 'rails', '4.2.8'
# Use PostgreSQL
gem 'pg', '~> 0.19.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0', '>= 5.0.4'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 3.0.4'
gem 'uglifier', '~> 3.1.6'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2.1'
# See https://github.com/rails/execjs#readme for more supported runtimes
@@ -40,11 +40,11 @@ gem 'foundation_rails_helper', '~> 2.0.0'
gem 'acts_as_votable'
gem 'ckeditor', '~> 4.2.2'
gem 'invisible_captcha', '~> 0.9.2'
gem 'cancancan'
gem 'cancancan', '~> 1.16.0'
gem 'social-share-button'
gem 'initialjs-rails', '0.2.0.4'
gem 'unicorn', '~> 5.2.0'
gem 'paranoia', '~> 2.2.0'
gem 'paranoia', '~> 2.2.1'
gem 'rinku', '~> 2.0.2', require: 'rails_rinku'
gem 'savon'
gem 'dalli'
@@ -52,18 +52,18 @@ gem 'rollbar', '~> 2.14.0'
gem 'delayed_job_active_record', '~> 4.1.0'
gem 'daemons'
gem 'devise-async'
gem 'newrelic_rpm', '~> 3.17.2.327'
gem 'newrelic_rpm', '~> 3.18.1.330'
gem 'whenever', require: false
gem 'pg_search'
gem 'sitemap_generator'
gem 'sitemap_generator', '~> 5.3.1'
gem 'ahoy_matey', '~> 1.5.3'
gem 'groupdate', '~> 3.1.0' # group temporary data
gem 'groupdate', '~> 3.2.0' # group temporary data
gem 'tolk', '~> 2.0.0' # Web interface for translations
gem 'browser'
gem 'turnout', '~> 2.4.0'
gem 'redcarpet'
gem 'redcarpet', '~> 3.4.0'
gem 'rails-assets-markdown-it', source: 'https://rails-assets.org'
@@ -76,28 +76,28 @@ group :development, :test do
gem 'spring'
gem 'spring-commands-rspec'
gem 'rspec-rails', '~> 3.5'
gem 'capybara'
gem 'factory_girl_rails'
gem 'capybara', '~> 2.12.1'
gem 'factory_girl_rails', '~> 4.8.0'
gem 'fuubar'
gem 'launchy'
gem 'quiet_assets'
gem 'letter_opener_web', '~> 1.3.0'
gem 'i18n-tasks'
gem 'capistrano', '3.5.0', require: false
gem 'letter_opener_web', '~> 1.3.1'
gem 'i18n-tasks', '~> 0.9.12'
gem 'capistrano', '~> 3.7.2', require: false
gem 'capistrano-bundler', '~> 1.2', require: false
gem "capistrano-rails", '1.1.8', require: false
gem "capistrano-rails", '~> 1.2.3', 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 'capistrano3-delayed-job', '~> 1.7.3'
gem "bullet", '~> 5.5.1'
gem "faker", '~> 1.7.3'
gem 'rubocop', '~> 0.47.1', require: false
gem 'knapsack'
end
group :test do
gem 'database_cleaner'
gem 'poltergeist'
gem 'coveralls', require: false
gem 'poltergeist', '~> 1.13.0'
gem 'coveralls', '~> 0.8.19', require: false
gem 'email_spec'
end