diff --git a/Gemfile b/Gemfile index e925fb642..ab00df68e 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'jquery-ui-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' -gem 'devise', '~> 3.5.6' +gem 'devise', '~> 3.5.7' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' gem 'omniauth' @@ -52,7 +52,7 @@ gem 'newrelic_rpm', '~> 3.14' gem 'whenever', require: false gem 'pg_search' -gem 'ahoy_matey', '~> 1.2.1' +gem 'ahoy_matey', '~> 1.4.0' gem 'groupdate' # group temporary data gem 'tolk' # Web interface for translations @@ -74,7 +74,7 @@ group :development, :test do gem 'quiet_assets' gem 'letter_opener_web', '~> 1.3.0' gem 'i18n-tasks' - gem 'capistrano', '3.4.0', require: false + gem 'capistrano', '3.4.1', require: false gem "capistrano-bundler", '1.1.4', require: false gem "capistrano-rails", '1.1.6', require: false gem "capistrano-rvm", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 755561fb2..12cb537d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,14 +49,15 @@ GEM activerecord (>= 3.2, < 5) acts_as_votable (0.10.0) addressable (2.4.0) - ahoy_matey (1.2.1) + ahoy_matey (1.4.0) addressable - browser (>= 0.4.0) - errbase + browser (~> 2.0) geocoder - rails + rack-attack + railties referer-parser (>= 0.3.0) request_store + safely_block user_agent_parser uuidtools akami (1.3.1) @@ -70,15 +71,15 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcrypt (3.1.10) - browser (1.1.0) + bcrypt (3.1.11) + browser (2.0.3) builder (3.2.2) bullet (5.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) - byebug (8.2.2) + byebug (8.2.4) cancancan (1.13.1) - capistrano (3.4.0) + capistrano (3.4.1) i18n rake (>= 10.0.0) sshkit (~> 1.3) @@ -91,9 +92,9 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano3-delayed-job (1.6.0) + capistrano3-delayed-job (1.7.0) capistrano (>= 3.0.0) - capybara (2.6.2) + capybara (2.7.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -125,14 +126,14 @@ GEM tins (~> 1.6.0) daemons (1.2.3) dalli (2.7.6) - database_cleaner (1.5.1) + database_cleaner (1.5.2) debug_inspector (0.0.2) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) delayed_job_active_record (4.1.0) activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) - devise (3.5.6) + devise (3.5.7) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -154,16 +155,16 @@ GEM errbase (0.0.3) erubis (2.7.0) execjs (2.6.0) - factory_girl (4.5.0) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) faker (1.6.3) i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) - foundation-rails (6.2.0.1) + foundation-rails (6.2.1.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) @@ -176,7 +177,7 @@ GEM fuubar (2.0.0) rspec (~> 3.0) ruby-progressbar (~> 1.4) - geocoder (1.3.1) + geocoder (1.3.4) globalid (0.3.6) activesupport (>= 4.1.0) groupdate (2.5.2) @@ -223,9 +224,11 @@ GEM railties (>= 3.2) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.99.1) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) minitest (5.8.4) multi_json (1.11.2) @@ -233,7 +236,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.2) + net-ssh (3.1.1) newrelic_rpm (3.15.1.316) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) @@ -284,6 +287,8 @@ GEM rack (1.6.4) rack-accept (0.4.5) rack (>= 0.4) + rack-attack (4.4.1) + rack rack-test (0.6.3) rack (>= 1.0) rails (4.2.6) @@ -314,7 +319,7 @@ GEM rake (11.1.2) redcarpet (3.3.4) referer-parser (0.3.0) - request_store (1.3.0) + request_store (1.3.1) responders (2.1.2) railties (>= 4.2.0, < 5.1) rinku (1.7.3) @@ -343,7 +348,9 @@ GEM rspec-support (3.4.1) ruby-progressbar (1.7.5) safe_yaml (1.0.4) - sass (3.4.21) + safely_block (0.1.0) + errbase + sass (3.4.22) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -365,10 +372,10 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - spring (1.6.4) + spring (1.7.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.0) @@ -379,7 +386,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.8.1) + sshkit (1.9.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.3.2) @@ -432,13 +439,13 @@ PLATFORMS DEPENDENCIES acts-as-taggable-on acts_as_votable - ahoy_matey (~> 1.2.1) + ahoy_matey (~> 1.4.0) ancestry browser bullet byebug cancancan - capistrano (= 3.4.0) + capistrano (= 3.4.1) capistrano-bundler (= 1.1.4) capistrano-rails (= 1.1.6) capistrano-rvm @@ -451,7 +458,7 @@ DEPENDENCIES dalli database_cleaner delayed_job_active_record (~> 4.1.0) - devise (~> 3.5.6) + devise (~> 3.5.7) devise-async email_spec factory_girl_rails diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb index c54816071..64313e030 100644 --- a/app/views/admin/spending_proposals/show.html.erb +++ b/app/views/admin/spending_proposals/show.html.erb @@ -1,4 +1,4 @@ -<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)) do %> +<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)), data: {no_turbolink: true} do %> <%= t("admin.spending_proposals.show.back") %> <% end %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index b0aa58ce4..cfce656a2 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -56,7 +56,7 @@