suite

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 
-gem 'rails', '4.2.6'
+gem 'rails', '4.2.10'
 
 gem "mysql2"
 
@@ -38,7 +38,7 @@ group :development, :test do
   
   gem "capistrano", '2.15.9', group: :development,  require: false
   gem "rvm-capistrano",'1.4.1', group: :development
-  gem 'net-ssh', '~>2.7.0'
+  gem 'net-ssh', '~> 5.1.0'
   
   
   gem 'web-console', '~> 2.0'

Gemfile.lock

@@ -1,38 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.6)
+    actionmailer (4.2.10)
-      actionpack (= 4.2.6)
+      actionpack (= 4.2.10)
-      actionview (= 4.2.6)
+      actionview (= 4.2.10)
-      activejob (= 4.2.6)
+      activejob (= 4.2.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
+    actionpack (4.2.10)
-      actionview (= 4.2.6)
+      actionview (= 4.2.10)
-      activesupport (= 4.2.6)
+      activesupport (= 4.2.10)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
+    actionview (4.2.10)
-      activesupport (= 4.2.6)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.6)
+    activejob (4.2.10)
-      activesupport (= 4.2.6)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.6)
+    activemodel (4.2.10)
-      activesupport (= 4.2.6)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.6)
+    activerecord (4.2.10)
-      activemodel (= 4.2.6)
+      activemodel (= 4.2.10)
-      activesupport (= 4.2.6)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -40,11 +39,11 @@ GEM
     acts_as_tree (2.1.0)
       activerecord (>= 3.0.0)
     addressable (2.4.0)
-    arel (6.0.3)
+    arel (6.0.4)
     bcrypt (3.1.10)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    builder (3.2.3)
+    builder (3.2.4)
     byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
@@ -68,14 +67,15 @@ GEM
       execjs
     coffee-script-source (1.9.1)
     columnize (0.9.0)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.1.6)
     countries (1.2.2)
       currencies (~> 0.4.2)
       i18n_data (~> 0.7.0)
     country_select (2.5.1)
       countries (~> 1.2.0)
       sort_alphabetical (~> 1.0)
-    curb (0.8.8)
+    crass (1.0.6)
+    curb (0.9.10)
     currencies (0.4.2)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
@@ -101,8 +101,8 @@ GEM
     gibbon (3.1.1)
       faraday (>= 0.9.1)
       multi_json (>= 1.11.0)
-    globalid (0.3.6)
+    globalid (0.4.2)
-      activesupport (>= 4.1.0)
+      activesupport (>= 4.2.0)
     gravatar_image_tag (1.2.0)
     haml (4.0.6)
       tilt
@@ -119,7 +119,7 @@ GEM
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (0.9.3)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     i18n_data (0.7.0)
     iban-tools (1.1.0)
@@ -140,15 +140,17 @@ GEM
       rails
     kgio (2.9.3)
     libv8 (3.16.14.7)
-    loofah (2.0.3)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.7.1)
-      mime-types (>= 1.16, < 4)
+      mini_mime (>= 0.1.1)
-    mime-types (3.1)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2020.0512)
+    mini_mime (1.0.2)
     mini_portile2 (2.1.0)
-    minitest (5.11.3)
+    minitest (5.14.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -157,12 +159,11 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
+    net-ssh (5.1.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     oauth2 (1.4.0)
       faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
@@ -182,42 +183,40 @@ GEM
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    pkg-config (1.1.7)
     posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
+    pygments.rb (1.2.1)
-      posix-spawn (~> 0.3.6)
+      multi_json (>= 1.0.0)
-      yajl-ruby (~> 1.2.0)
+    rack (1.6.13)
-    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.6)
+    rails (4.2.10)
-      actionmailer (= 4.2.6)
+      actionmailer (= 4.2.10)
-      actionpack (= 4.2.6)
+      actionpack (= 4.2.10)
-      actionview (= 4.2.6)
+      actionview (= 4.2.10)
-      activejob (= 4.2.6)
+      activejob (= 4.2.10)
-      activemodel (= 4.2.6)
+      activemodel (= 4.2.10)
-      activerecord (= 4.2.6)
+      activerecord (= 4.2.10)
-      activesupport (= 4.2.6)
+      activesupport (= 4.2.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.10)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
+    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.0)
+      loofah (~> 2.3)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.2.6)
+    railties (4.2.10)
-      actionpack (= 4.2.6)
+      actionpack (= 4.2.10)
-      activesupport (= 4.2.6)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (11.2.2)
+    rake (13.0.1)
     rdoc (4.2.0)
       json (~> 1.4)
     redcarpet (3.3.4)
@@ -257,17 +256,17 @@ GEM
     spreadsheet (1.0.9)
       ruby-ole (>= 1.0)
     spring (1.3.2)
-    sprockets (3.6.2)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.1)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (1.4.1)
     truncate_html (0.9.3)
@@ -280,7 +279,7 @@ GEM
       railties (~> 4.1)
     twitter-text (1.13.4)
       unf (~> 0.1.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (2.7.0)
       execjs (>= 0.3.0)
@@ -301,7 +300,6 @@ GEM
     wicked_pdf (0.11.0)
       rails
     xml-simple (1.1.5)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
@@ -328,13 +326,13 @@ DEPENDENCIES
   jquery-rails
   kaminari-bootstrap
   mysql2
-  net-ssh (~> 2.7.0)
+  net-ssh (~> 5.1.0)
   nokogiri
   omniauth-facebook
   paypal-sdk-merchant
   posix-spawn
   pygments.rb
-  rails (= 4.2.6)
+  rails (= 4.2.10)
   rails_autolink
   redcarpet
   rmagick
@@ -356,4 +354,4 @@ DEPENDENCIES
   wicked_pdf
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

app/assets/javascripts/vendor/jquery.cookiebar.js

@@ -175,7 +175,6 @@
 			var anyClick = function(e){
 				if(!$(e.target).hasClass('cb-policy')) cookieAccept();
 			};
-			alert('a');
 			$('#cookie-bar .cb-enable').click(function(){cookieAccept();return false;});
 			$('#cookie-bar .cb-disable').click(function(){cookieDecline();return false;});
 			if(options.acceptOnScroll){

app/views/layouts/public.html.haml

@@ -277,6 +277,5 @@
       resize()
 
     :javascript
-      alert("");
       $.cookieBar();