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

Merge pull request #1468 from consul/update-dependencies

Browse Source 
Update dependencies
This commit is contained in:
Enrique García
2017-03-31 12:03:29 +02:00
committed by GitHub
parent 986a133394 ada8596b01
commit cfa804040a
3 changed files with 75 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Gemfile
View File

@@ -3,18 +3,18 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.8' gem 'rails', '4.2.8'
# Use PostgreSQL # Use PostgreSQL
gem 'pg', '~> 0.19.0' gem 'pg', '~> 0.20.0'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0', '>= 5.0.4' gem 'sass-rails', '~> 5.0', '>= 5.0.4'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '~> 3.1.6' gem 'uglifier', '~> 3.1.9'
# Use CoffeeScript for .coffee assets and views # Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2.1' gem 'coffee-rails', '~> 4.2.1'
# See https://github.com/rails/execjs#readme for more supported runtimes # See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby # gem 'therubyracer', platforms: :ruby
# Use jquery as the JavaScript library # Use jquery as the JavaScript library
gem 'jquery-rails', '~> 4.2.2' gem 'jquery-rails', '~> 4.3.1'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks' gem 'turbolinks'
@@ -28,10 +28,10 @@ gem 'devise_security_extension'
# gem 'bcrypt', '~> 3.1.7' # gem 'bcrypt', '~> 3.1.7'
gem 'omniauth' gem 'omniauth'
gem 'omniauth-twitter' gem 'omniauth-twitter'
gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-google-oauth2', '~> 0.4.0' gem 'omniauth-google-oauth2', '~> 0.4.0'
gem 'kaminari' gem 'kaminari', '~> 1.0.1'
gem 'ancestry', '~> 2.2.2' gem 'ancestry', '~> 2.2.2'
gem 'acts-as-taggable-on' gem 'acts-as-taggable-on'
gem 'responders', '~> 2.3.0' gem 'responders', '~> 2.3.0'
@@ -48,16 +48,16 @@ gem 'paranoia', '~> 2.2.1'
gem 'rinku', '~> 2.0.2', require: 'rails_rinku' gem 'rinku', '~> 2.0.2', require: 'rails_rinku'
gem 'savon' gem 'savon'
gem 'dalli' gem 'dalli'
gem 'rollbar', '~> 2.14.0' gem 'rollbar', '~> 2.14.1'
gem 'delayed_job_active_record', '~> 4.1.0' gem 'delayed_job_active_record', '~> 4.1.0'
gem 'daemons' gem 'daemons'
gem 'devise-async' gem 'devise-async'
gem 'newrelic_rpm', '~> 3.18.1.330' gem 'newrelic_rpm', '~> 4.0.0.332'
gem 'whenever', require: false gem 'whenever', require: false
gem 'pg_search' gem 'pg_search'
gem 'sitemap_generator', '~> 5.3.1' gem 'sitemap_generator', '~> 5.3.1'
gem 'ahoy_matey', '~> 1.5.3' gem 'ahoy_matey', '~> 1.5.5'
gem 'groupdate', '~> 3.2.0' # group temporary data gem 'groupdate', '~> 3.2.0' # group temporary data
gem 'tolk', '~> 2.0.0' # Web interface for translations gem 'tolk', '~> 2.0.0' # Web interface for translations
@@ -72,14 +72,14 @@ group :development, :test do
gem 'spring' gem 'spring'
gem 'spring-commands-rspec' gem 'spring-commands-rspec'
gem 'rspec-rails', '~> 3.5' gem 'rspec-rails', '~> 3.5'
gem 'capybara', '~> 2.12.1' gem 'capybara', '~> 2.13.0'
gem 'factory_girl_rails', '~> 4.8.0' gem 'factory_girl_rails', '~> 4.8.0'
gem 'fuubar' gem 'fuubar'
gem 'launchy' gem 'launchy'
gem 'quiet_assets' gem 'quiet_assets'
gem 'letter_opener_web', '~> 1.3.1' gem 'letter_opener_web', '~> 1.3.1'
gem 'i18n-tasks', '~> 0.9.12' gem 'i18n-tasks', '~> 0.9.12'
gem 'capistrano', '~> 3.7.2', require: false gem 'capistrano', '~> 3.8.0', require: false
gem 'capistrano-bundler', '~> 1.2', require: false gem 'capistrano-bundler', '~> 1.2', require: false
gem "capistrano-rails", '~> 1.2.3', require: false gem "capistrano-rails", '~> 1.2.3', require: false
gem 'rvm1-capistrano3', require: false gem 'rvm1-capistrano3', require: false
@@ -92,7 +92,7 @@ end
group :test do group :test do
gem 'database_cleaner' gem 'database_cleaner'
gem 'poltergeist', '~> 1.13.0' gem 'poltergeist', '~> 1.14.0'
gem 'coveralls', '~> 0.8.19', require: false gem 'coveralls', '~> 0.8.19', require: false
gem 'email_spec' gem 'email_spec'
end end

117
Gemfile.lock
View File

@@ -35,12 +35,12 @@ GEM
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
acts-as-taggable-on (3.5.0) acts-as-taggable-on (4.0.0)
activerecord (>= 3.2, < 5) activerecord (>= 4.0)
acts_as_votable (0.10.0) acts_as_votable (0.10.0)
addressable (2.5.0) addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2) public_suffix (~> 2.0, >= 2.0.2)
ahoy_matey (1.5.4) ahoy_matey (1.5.5)
addressable addressable
browser (~> 2.0) browser (~> 2.0)
geocoder geocoder
@@ -72,23 +72,21 @@ GEM
uniform_notifier (~> 1.10.0) uniform_notifier (~> 1.10.0)
byebug (9.0.6) byebug (9.0.6)
cancancan (1.16.0) cancancan (1.16.0)
capistrano (3.7.2) capistrano (3.8.0)
airbrussh (>= 1.0.0) airbrussh (>= 1.0.0)
capistrano-harrow
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (>= 1.9.0) sshkit (>= 1.9.0)
capistrano-bundler (1.2.0) capistrano-bundler (1.2.0)
capistrano (~> 3.1) capistrano (~> 3.1)
sshkit (~> 1.2) sshkit (~> 1.2)
capistrano-harrow (0.5.3)
capistrano-rails (1.2.3) capistrano-rails (1.2.3)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano3-delayed-job (1.7.3) capistrano3-delayed-job (1.7.3)
capistrano (~> 3.0, >= 3.0.0) capistrano (~> 3.0, >= 3.0.0)
daemons (~> 1.2.4) daemons (~> 1.2.4)
capybara (2.12.1) capybara (2.13.0)
addressable addressable
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
@@ -110,8 +108,8 @@ GEM
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.12.2)
concurrent-ruby (1.0.4) concurrent-ruby (1.0.5)
coveralls (0.8.19) coveralls (0.8.19)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov (~> 0.12.0) simplecov (~> 0.12.0)
@@ -159,7 +157,7 @@ GEM
railties (>= 3.0.0) railties (>= 3.0.0)
faker (1.7.3) faker (1.7.3)
i18n (~> 0.5) i18n (~> 0.5)
faraday (0.9.2) faraday (0.11.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
foundation-rails (6.2.4.0) foundation-rails (6.2.4.0)
railties (>= 3.1.0) railties (>= 3.1.0)
@@ -181,7 +179,7 @@ GEM
activesupport (>= 3) activesupport (>= 3)
gyoku (1.3.1) gyoku (1.3.1)
builder (>= 2.1.2) builder (>= 2.1.2)
hashie (3.4.6) hashie (3.5.5)
highline (1.7.8) highline (1.7.8)
htmlentities (4.3.4) htmlentities (4.3.4)
httpi (2.4.1) httpi (2.4.1)
@@ -201,19 +199,28 @@ GEM
railties (>= 3.1, < 6.0) railties (>= 3.1, < 6.0)
invisible_captcha (0.9.2) invisible_captcha (0.9.2)
rails (>= 3.2.0) rails (>= 3.2.0)
jquery-rails (4.2.2) jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (1.8.6) json (2.0.3)
jwt (1.5.4) jwt (1.5.6)
kaminari (0.17.0) kaminari (1.0.1)
actionpack (>= 3.0.0) activesupport (>= 4.1.0)
activesupport (>= 3.0.0) kaminari-actionview (= 1.0.1)
kaminari-activerecord (= 1.0.1)
kaminari-core (= 1.0.1)
kaminari-actionview (1.0.1)
actionview
kaminari-core (= 1.0.1)
kaminari-activerecord (1.0.1)
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.11.0) kgio (2.11.0)
knapsack (1.13.1) knapsack (1.13.2)
rake rake
timecop (>= 0.1.0) timecop (>= 0.1.0)
launchy (2.4.3) launchy (2.4.3)
@@ -234,26 +241,26 @@ GEM
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.10.1) minitest (5.10.1)
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.5.5) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (4.1.0) net-ssh (4.1.0)
newrelic_rpm (3.18.1.330) newrelic_rpm (4.0.0.332)
nokogiri (1.7.1) nokogiri (1.7.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
nori (2.6.0) nori (2.6.0)
oauth (0.5.0) oauth (0.5.1)
oauth2 (1.0.0) oauth2 (1.3.1)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.12)
jwt (~> 1.0) jwt (~> 1.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (~> 1.2) rack (>= 1.2, < 3)
omniauth (1.3.1) omniauth (1.6.1)
hashie (>= 1.2, < 4) hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.0, < 3) rack (>= 1.6.2, < 3)
omniauth-facebook (3.0.0) omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2) omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (0.4.1) omniauth-google-oauth2 (0.4.1)
jwt (~> 1.5.2) jwt (~> 1.5.2)
@@ -266,20 +273,20 @@ GEM
omniauth-oauth2 (1.4.0) omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0) oauth2 (~> 1.0)
omniauth (~> 1.2) omniauth (~> 1.2)
omniauth-twitter (1.2.1) omniauth-twitter (1.4.0)
json (~> 1.3)
omniauth-oauth (~> 1.1) omniauth-oauth (~> 1.1)
rack
orm_adapter (0.5.0) orm_adapter (0.5.0)
paranoia (2.2.1) paranoia (2.2.1)
activerecord (>= 4.0, < 5.1) activerecord (>= 4.0, < 5.1)
parser (2.4.0.0) parser (2.4.0.0)
ast (~> 2.2) ast (~> 2.2)
pg (0.19.0) pg (0.20.0)
pg_search (1.0.6) pg_search (2.0.1)
activerecord (>= 3.1) activerecord (>= 4.2)
activesupport (>= 3.1) activesupport (>= 4.2)
arel arel (>= 6)
poltergeist (1.13.0) poltergeist (1.14.0)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
@@ -327,7 +334,7 @@ GEM
responders (2.3.0) responders (2.3.0)
railties (>= 4.2.0, < 5.1) railties (>= 4.2.0, < 5.1)
rinku (2.0.2) rinku (2.0.2)
rollbar (2.14.0) rollbar (2.14.1)
multi_json multi_json
rspec-core (3.5.4) rspec-core (3.5.4)
rspec-support (~> 3.5.0) rspec-support (~> 3.5.0)
@@ -359,7 +366,7 @@ GEM
safe_yaml (1.0.4) safe_yaml (1.0.4)
safely_block (0.2.0) safely_block (0.2.0)
errbase errbase
sass (3.4.22) sass (3.4.23)
sass-rails (5.0.6) sass-rails (5.0.6)
railties (>= 4.0.0, < 6) railties (>= 4.0.0, < 6)
sass (~> 3.1) sass (~> 3.1)
@@ -381,10 +388,10 @@ GEM
simplecov-html (0.10.0) simplecov-html (0.10.0)
sitemap_generator (5.3.1) sitemap_generator (5.3.1)
builder (~> 3.0) builder (~> 3.0)
social-share-button (0.3.1) social-share-button (0.10.0)
coffee-rails coffee-rails
sass-rails spring (2.0.1)
spring (1.7.2) activesupport (>= 4.2)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (3.7.1) sprockets (3.7.1)
@@ -408,7 +415,7 @@ GEM
thor (0.19.4) thor (0.19.4)
thread (0.2.2) thread (0.2.2)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.5) tilt (2.0.7)
timecop (0.8.1) timecop (0.8.1)
tins (1.13.2) tins (1.13.2)
tolk (2.0.0) tolk (2.0.0)
@@ -423,7 +430,7 @@ GEM
tilt (>= 1.4, < 3) tilt (>= 1.4, < 3)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (3.1.6) uglifier (3.1.9)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (1.1.3) unicode-display_width (1.1.3)
unicorn (5.2.0) unicorn (5.2.0)
@@ -455,17 +462,17 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
acts-as-taggable-on acts-as-taggable-on
acts_as_votable acts_as_votable
ahoy_matey (~> 1.5.3) ahoy_matey (~> 1.5.5)
ancestry (~> 2.2.2) ancestry (~> 2.2.2)
browser browser
bullet (~> 5.5.1) bullet (~> 5.5.1)
byebug byebug
cancancan (~> 1.16.0) cancancan (~> 1.16.0)
capistrano (~> 3.7.2) capistrano (~> 3.8.0)
capistrano-bundler (~> 1.2) capistrano-bundler (~> 1.2)
capistrano-rails (~> 1.2.3) capistrano-rails (~> 1.2.3)
capistrano3-delayed-job (~> 1.7.3) capistrano3-delayed-job (~> 1.7.3)
capybara (~> 2.12.1) capybara (~> 2.13.0)
ckeditor (~> 4.2.2) ckeditor (~> 4.2.2)
coffee-rails (~> 4.2.1) coffee-rails (~> 4.2.1)
coveralls (~> 0.8.19) coveralls (~> 0.8.19)
@@ -486,27 +493,27 @@ DEPENDENCIES
i18n-tasks (~> 0.9.12) i18n-tasks (~> 0.9.12)
initialjs-rails (= 0.2.0.4) initialjs-rails (= 0.2.0.4)
invisible_captcha (~> 0.9.2) invisible_captcha (~> 0.9.2)
jquery-rails (~> 4.2.2) jquery-rails (~> 4.3.1)
jquery-ui-rails jquery-ui-rails
kaminari kaminari (~> 1.0.1)
knapsack knapsack
launchy launchy
letter_opener_web (~> 1.3.1) letter_opener_web (~> 1.3.1)
newrelic_rpm (~> 3.18.1.330) newrelic_rpm (~> 4.0.0.332)
omniauth omniauth
omniauth-facebook (~> 3.0.0) omniauth-facebook (~> 4.0.0)
omniauth-google-oauth2 (~> 0.4.0) omniauth-google-oauth2 (~> 0.4.0)
omniauth-twitter omniauth-twitter
paranoia (~> 2.2.1) paranoia (~> 2.2.1)
pg (~> 0.19.0) pg (~> 0.20.0)
pg_search pg_search
poltergeist (~> 1.13.0) poltergeist (~> 1.14.0)
quiet_assets quiet_assets
rails (= 4.2.8) rails (= 4.2.8)
redcarpet (~> 3.4.0) redcarpet (~> 3.4.0)
responders (~> 2.3.0) responders (~> 2.3.0)
rinku (~> 2.0.2) rinku (~> 2.0.2)
rollbar (~> 2.14.0) rollbar (~> 2.14.1)
rspec-rails (~> 3.5) rspec-rails (~> 3.5)
rubocop (~> 0.47.1) rubocop (~> 0.47.1)
rvm1-capistrano3 rvm1-capistrano3
@@ -520,7 +527,7 @@ DEPENDENCIES
tolk (~> 2.0.0) tolk (~> 2.0.0)
turbolinks turbolinks
turnout (~> 2.4.0) turnout (~> 2.4.0)
uglifier (~> 3.1.6) uglifier (~> 3.1.9)
unicorn (~> 5.2.0) unicorn (~> 5.2.0)
web-console (= 3.3.0) web-console (= 3.3.0)
whenever whenever

4
app/assets/javascripts/application.js
View File

@@ -12,8 +12,8 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require jquery-ui/datepicker //= require jquery-ui/widgets/datepicker
//= require jquery-ui/datepicker-es //= require jquery-ui/i18n/datepicker-es
//= require foundation //= require foundation
//= require turbolinks //= require turbolinks
//= require ckeditor/loader //= require ckeditor/loader