Merge branch 'release/release6.4'

Gemfile

@@ -5,7 +5,7 @@
 source 'https://rubygems.org'
 
 # Ruby version
-ruby '2.2.3'
+ruby '2.3.1'
 
 # Ruby on Rails
 gem 'rails', '4.2.5'
@@ -17,7 +17,7 @@ gem 'pg', '0.18.4'
 gem 'devise', '3.5.2'
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '5.0.4'
+gem 'sass-rails', '5.0.5'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '2.7.2'
@@ -71,8 +71,8 @@ gem 'phony_rails', '0.12.11'
 gem 'acts_as_list', '0.7.2'
 
 # Emails
-gem 'roadie', '3.0.5'
-gem 'roadie-rails', '1.0.6'
+gem 'roadie', '3.1.1'
+gem 'roadie-rails', '1.1.1'
 
 # Development dependencies
 group :development do

Gemfile.lock

@@ -21,7 +21,7 @@ GEM
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_admin_theme (1.0.3)
-    activeadmin (1.0.0.pre2)
+    activeadmin (1.0.0.pre4)
       arbre (~> 1.0, >= 1.0.2)
       bourbon
       coffee-rails
@@ -31,9 +31,10 @@ GEM
       jquery-rails
       jquery-ui-rails
       kaminari (~> 0.15)
-      rails (>= 3.2, < 5.0)
+      rails (>= 3.2, < 5.1)
       ransack (~> 1.3)
       sass-rails
+      sprockets (< 4)
     activeadmin-sortable (0.0.3)
       activeadmin (>= 0.4)
     activejob (4.2.5)
@@ -54,19 +55,18 @@ GEM
       tzinfo (~> 1.1)
     acts_as_list (0.7.2)
       activerecord (>= 3.0)
-    addressable (2.3.8)
-    annotate (2.6.10)
-      activerecord (>= 3.2, <= 4.3)
-      rake (~> 10.4)
+    addressable (2.4.0)
+    annotate (2.7.1)
+      activerecord (>= 3.2, < 6.0)
+      rake (>= 10.4, < 12.0)
     ansi (1.5.0)
-    arbre (1.0.3)
+    arbre (1.1.1)
       activesupport (>= 3.0.0)
     arel (6.0.3)
-    autoprefixer-rails (6.1.0.1)
+    autoprefixer-rails (6.3.7)
       execjs
-      json
-    awesome_print (1.6.1)
-    bcrypt (3.1.10)
+    awesome_print (1.7.0)
+    bcrypt (3.1.11)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -78,12 +78,13 @@ GEM
       sass (>= 3.3.0)
     bootswatch-rails (3.3.5)
       railties (>= 3.1)
-    bourbon (4.2.6)
+    bourbon (4.2.7)
       sass (~> 3.4)
       thor (~> 0.19)
     builder (3.2.2)
-    byebug (8.2.0)
-    capybara (2.5.0)
+    byebug (9.0.5)
+    capybara (2.7.1)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -92,18 +93,19 @@ GEM
     capybara_minitest_spec (1.0.5)
       capybara (>= 2)
       minitest (>= 4)
-    childprocess (0.5.8)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    codeclimate-test-reporter (0.4.8)
+    codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.2)
     css_parser (1.3.7)
       addressable
     debug_inspector (0.0.2)
@@ -114,16 +116,16 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    dnsruby (1.59.2)
+    dnsruby (1.59.3)
     docile (1.1.5)
     email_verifier (0.1.0)
       dnsruby (>= 1.5)
     erubis (2.7.0)
-    execjs (2.6.0)
-    ffi (1.9.10)
-    formtastic (3.1.3)
+    execjs (2.7.0)
+    ffi (1.9.14)
+    formtastic (3.1.4)
       actionpack (>= 3.2.13)
-    formtastic_i18n (0.4.1)
+    formtastic_i18n (0.6.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     haml (4.0.7)
@@ -158,65 +160,69 @@ GEM
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.8.3)
-    minitest-capybara (0.7.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    minitest-capybara (0.8.2)
       capybara (~> 2.2)
       minitest (~> 5.0)
       rake
-    minitest-metadata (0.5.3)
+    minitest-metadata (0.6.0)
       minitest (>= 4.7, < 6.0)
-    minitest-rails (2.2.0)
+    minitest-rails (2.2.1)
       minitest (~> 5.7)
       railties (~> 4.1)
-    minitest-rails-capybara (2.1.1)
-      capybara (~> 2.0)
-      minitest-capybara (~> 0.7.0)
-      minitest-metadata (~> 0.5.0)
+    minitest-rails-capybara (2.1.2)
+      capybara (~> 2.7)
+      minitest-capybara (~> 0.8)
+      minitest-metadata (~> 0.6)
       minitest-rails (~> 2.1)
-    minitest-reporters (1.1.8)
+    minitest-reporters (1.1.10)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    minitest-spec-rails (5.3.0)
+    minitest-spec-rails (5.4.0)
       minitest (~> 5.0)
       rails (>= 4.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     newrelic_rpm (3.15.2.317)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
     pg (0.18.4)
-    phony (2.15.8)
+    phony (2.15.26)
     phony_rails (0.12.11)
       activesupport (>= 3.0)
       phony (~> 2.12)
-    polyamorous (1.2.0)
+    pkg-config (1.1.7)
+    polyamorous (1.3.0)
       activerecord (>= 3.0)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.3.0)
-      byebug (~> 8.0)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
       pry (~> 0.10)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-rescue (1.4.2)
+    pry-rescue (1.4.4)
       interception (>= 0.5)
       pry
     quiet_assets (1.1.0)
@@ -241,55 +247,55 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.4)
-    rails_stdout_logging (0.0.4)
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (4.2.5)
       actionpack (= 4.2.5)
       activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.15.0)
-    rake (10.4.2)
+    raindrops (0.16.0)
+    rake (11.2.2)
     ransack (1.7.0)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.2)
-    rdoc (4.2.0)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
-    roadie (3.0.5)
+    rdoc (4.2.2)
+      json (~> 1.4)
+    responders (2.2.0)
+      railties (>= 4.2.0, < 5.1)
+    roadie (3.1.1)
       css_parser (~> 1.3.4)
-      nokogiri (~> 1.6.0)
-    roadie-rails (1.0.6)
-      railties (>= 3.0, < 4.3)
-      roadie (~> 3.0)
-    ruby-progressbar (1.7.5)
-    ruby_parser (3.7.2)
+      nokogiri (>= 1.5.0, < 1.7.0)
+    roadie-rails (1.1.1)
+      railties (>= 3.0, < 5.1)
+      roadie (~> 3.1)
+    ruby-progressbar (1.8.1)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    rubyzip (1.1.7)
-    sass (3.4.19)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    rubyzip (1.2.0)
+    sass (3.4.22)
+    sass-rails (5.0.5)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
     sdoc (0.4.0)
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
-    selenium-webdriver (2.48.1)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
-      multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sexp_processor (4.6.0)
+    sexp_processor (4.7.0)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -299,22 +305,23 @@ GEM
     simple_form (3.2.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.10.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    spring (1.4.4)
-    sprockets (3.4.0)
+    spring (1.7.2)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.5)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
@@ -328,9 +335,9 @@ GEM
       raindrops (~> 0.7)
     validates_email_format_of (1.6.1)
       i18n
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
-    websocket (1.2.2)
+    websocket (1.2.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -369,9 +376,9 @@ DEPENDENCIES
   quiet_assets (~> 1.1)
   rails (= 4.2.5)
   rails_12factor (= 0.0.3)
-  roadie (= 3.0.5)
-  roadie-rails (= 1.0.6)
-  sass-rails (= 5.0.4)
+  roadie (= 3.1.1)
+  roadie-rails (= 1.1.1)
+  sass-rails (= 5.0.5)
   sdoc (= 0.4.0)
   selenium-webdriver (~> 2.48)
   shoulda (~> 3.5)
@@ -383,5 +390,8 @@ DEPENDENCIES
   unicorn (= 4.8.3)
   validates_email_format_of (= 1.6.1)
 
+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
-   1.10.6
+   1.12.5

config/initializers/assets.rb

@@ -1,3 +1,4 @@
+Rails.application.config.assets.precompile += %w( index.jpg )
 Rails.application.config.assets.precompile += %w( pages.js )
 Rails.application.config.assets.precompile += %w( email.css )
 Rails.application.config.assets.precompile += %w( tours/shared/common_tour_steps.js )