From 6688832f8ca3c043af7235da550d081a322ac134 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 5 Jan 2017 01:02:07 +0100 Subject: [PATCH 1/2] updates dependencies --- Gemfile | 16 ++++++++-------- Gemfile.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index 07b629886..13a0b3567 100644 --- a/Gemfile +++ b/Gemfile @@ -14,13 +14,13 @@ gem 'coffee-rails', '~> 4.2.1' # gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library -gem 'jquery-rails', '~> 4.2.1' +gem 'jquery-rails', '~> 4.2.2' 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.7.0' +gem 'sprockets', '~> 3.7.1' gem 'devise', '~> 3.5.7' gem 'devise_security_extension' @@ -38,26 +38,26 @@ gem 'responders', '~> 2.3.0' gem 'foundation-rails', '~> 6.2.4.0' gem 'foundation_rails_helper', '~> 2.0.0' gem 'acts_as_votable' -gem 'ckeditor', '~> 4.2.0' -gem 'invisible_captcha', '~> 0.9.1' +gem 'ckeditor', '~> 4.2.2' +gem 'invisible_captcha', '~> 0.9.2' gem 'cancancan' gem 'social-share-button' gem 'initialjs-rails', '0.2.0.4' -gem 'unicorn', '~> 5.1.0' +gem 'unicorn', '~> 5.2.0' gem 'paranoia', '~> 2.2.0' gem 'rinku', '~> 2.0.2', require: 'rails_rinku' gem 'savon' gem 'dalli' -gem 'rollbar', '~> 2.13.3' +gem 'rollbar', '~> 2.14.0' gem 'delayed_job_active_record', '~> 4.1.0' gem 'daemons' gem 'devise-async' -gem 'newrelic_rpm', '~> 3.17.1.326' +gem 'newrelic_rpm', '~> 3.17.2.327' gem 'whenever', require: false gem 'pg_search' gem 'sitemap_generator' -gem 'ahoy_matey', '~> 1.4.2' +gem 'ahoy_matey', '~> 1.5.3' gem 'groupdate', '~> 3.1.0' # group temporary data gem 'tolk', '~> 2.0.0' # Web interface for translations diff --git a/Gemfile.lock b/Gemfile.lock index fe1948752..a06007540 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,11 +40,11 @@ GEM activerecord (>= 3.2, < 5) acts_as_votable (0.10.0) addressable (2.4.0) - ahoy_matey (1.4.2) + ahoy_matey (1.5.3) addressable browser (~> 2.0) geocoder - rack-attack + rack-attack (< 6) railties referer-parser (>= 0.3.0) request_store @@ -95,7 +95,7 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) chronic (0.10.2) - ckeditor (4.2.0) + ckeditor (4.2.2) cocaine orm_adapter (~> 0.5.0) climate_control (0.0.3) @@ -110,7 +110,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.4) coveralls (0.8.17) json (>= 1.8, < 3) simplecov (~> 0.12.0) @@ -173,7 +173,7 @@ GEM fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - geocoder (1.4.0) + geocoder (1.4.1) globalid (0.3.7) activesupport (>= 4.1.0) groupdate (3.1.1) @@ -198,9 +198,9 @@ GEM terminal-table (>= 1.5.1) initialjs-rails (0.2.0.4) railties (>= 3.1, < 6.0) - invisible_captcha (0.9.1) - rails - jquery-rails (4.2.1) + invisible_captcha (0.9.2) + rails (>= 3.2.0) + jquery-rails (4.2.2) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -211,7 +211,7 @@ GEM kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.10.0) + kgio (2.11.0) knapsack (1.13.1) rake timecop (>= 0.1.0) @@ -238,7 +238,7 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.2.0) - newrelic_rpm (3.17.1.326) + newrelic_rpm (3.17.2.327) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) nori (2.6.0) @@ -325,7 +325,7 @@ GEM responders (2.3.0) railties (>= 4.2.0, < 5.1) rinku (2.0.2) - rollbar (2.13.3) + rollbar (2.14.0) multi_json rspec-core (3.5.4) rspec-support (~> 3.5.0) @@ -385,7 +385,7 @@ GEM spring (1.7.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.2) @@ -424,7 +424,7 @@ GEM uglifier (3.0.4) execjs (>= 0.3.0, < 3) unicode-display_width (1.1.1) - unicorn (5.1.0) + unicorn (5.2.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.10.0) @@ -453,7 +453,7 @@ PLATFORMS DEPENDENCIES acts-as-taggable-on acts_as_votable - ahoy_matey (~> 1.4.2) + ahoy_matey (~> 1.5.3) ancestry (~> 2.2.2) browser bullet @@ -464,7 +464,7 @@ DEPENDENCIES capistrano-rails (= 1.1.8) capistrano3-delayed-job (~> 1.0) capybara - ckeditor (~> 4.2.0) + ckeditor (~> 4.2.2) coffee-rails (~> 4.2.1) coveralls daemons @@ -483,14 +483,14 @@ DEPENDENCIES groupdate (~> 3.1.0) i18n-tasks initialjs-rails (= 0.2.0.4) - invisible_captcha (~> 0.9.1) - jquery-rails (~> 4.2.1) + invisible_captcha (~> 0.9.2) + jquery-rails (~> 4.2.2) jquery-ui-rails kaminari knapsack launchy letter_opener_web (~> 1.3.0) - newrelic_rpm (~> 3.17.1.326) + newrelic_rpm (~> 3.17.2.327) omniauth omniauth-facebook (~> 3.0.0) omniauth-google-oauth2 (~> 0.4.0) @@ -504,7 +504,7 @@ DEPENDENCIES redcarpet responders (~> 2.3.0) rinku (~> 2.0.2) - rollbar (~> 2.13.3) + rollbar (~> 2.14.0) rspec-rails (~> 3.5) rubocop (~> 0.45.0) rvm1-capistrano3 @@ -514,12 +514,12 @@ DEPENDENCIES social-share-button spring spring-commands-rspec - sprockets (~> 3.7.0) + sprockets (~> 3.7.1) tolk (~> 2.0.0) turbolinks turnout (~> 2.4.0) uglifier (>= 3.0.4) - unicorn (~> 5.1.0) + unicorn (~> 5.2.0) web-console (= 3.3.0) whenever From 4e019c79d649a3814e43b4c28f165f5703692592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Miedes=20Garc=C3=A9s?= Date: Sat, 7 Jan 2017 16:55:24 +0100 Subject: [PATCH 2/2] Fix typo --- spec/models/proposal_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index 9a9e9e9bc..3ab8365b9 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -123,7 +123,7 @@ describe Proposal do expect(proposal).to_not be_valid end - it "should be valid with a tag list of more than 6 elements" do + it "should be valid with a tag list of up to 6 elements" do proposal.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"] expect(proposal).to be_valid end