Merge branch 'master' into 0000-docker

1 files changed, 52 insertions, 19 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index def02b6ed..046167e69 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,10 +16,11 @@ GIT
 
 GIT
   remote: git@github.com:af83/stif-reflex-api.git
-  revision: 7c517b98c3900c9bb0b81dd0ccab97f8e8f5f249
+  revision: 7edaeddd971a1ed366bf6def1513bf8808ab2d1d
   specs:
-    reflex (0.0.1)
-      nokogiri (~> 1.6)
+    reflex (0.0.2)
+      nokogiri (>= 1.7.2)
+      ruby-filemagic
 
 GIT
   remote: https://github.com/af83/language_engine.git
@@ -146,8 +147,17 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
+    countries (2.1.3)
+      i18n_data (~> 0.8.0)
+      money (~> 6.9)
+      sixarm_ruby_unaccent (~> 1.1)
+      unicode_utils (~> 1.4)
+    country_select (3.1.1)
+      countries (~> 2.0)
+      sort_alphabetical (~> 1.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crass (1.0.3)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -227,6 +237,8 @@ GEM
     ffi (1.9.18)
     ffi-geos (1.2.0)
       ffi (>= 1.0.0)
+    flag-icons-rails (2.5.0)
+      sass (~> 3.2)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
     formtastic (3.1.5)
@@ -254,13 +266,13 @@ GEM
     hashdiff (0.3.4)
     highline (1.7.8)
     hike (1.2.3)
-    hstore_accessor (1.1.0)
-      activerecord (>= 4.0.0)
     htmlbeautifier (1.3.1)
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.0)
+    i18n (0.9.4)
       concurrent-ruby (~> 1.0)
+    i18n-js (3.0.4)
+      i18n (~> 0.6, >= 0.6.6)
     i18n-tasks (0.9.15)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
@@ -271,6 +283,7 @@ GEM
       parser (>= 2.2.3.0)
       rainbow (~> 2.2)
       terminal-table (>= 1.5.1)
+    i18n_data (0.8.0)
     inherited_resources (1.7.1)
       actionpack (>= 3.2, < 5.1)
       has_scope (~> 0.6)
@@ -295,7 +308,8 @@ GEM
       thor
       with_env (> 1.0)
       xml-simple
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
@@ -306,7 +320,9 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
+    money (6.10.1)
+      i18n (>= 0.6.4, < 1.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multi_xml (0.6.0)
@@ -319,7 +335,7 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     newrelic_rpm (4.0.0.332)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     open4 (1.3.4)
     orm_adapter (0.5.0)
@@ -355,9 +371,11 @@ GEM
     rabl (0.13.1)
       activesupport (>= 2.3.14)
     rack (1.6.8)
+    rack-livereload (0.3.16)
+      rack
     rack-protection (1.5.3)
       rack
-    rack-proxy (0.6.2)
+    rack-proxy (0.6.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -385,8 +403,8 @@ GEM
       rails-assets-jquery (>= 1.0.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-erd (1.5.2)
@@ -408,7 +426,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
+    rake (12.3.0)
     ransack (1.8.3)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -431,6 +449,10 @@ GEM
     roo (2.7.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -447,7 +469,10 @@ GEM
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
+    rspec-snapshot (0.1.1)
+      rspec (> 3.0.0)
     rspec-support (3.5.0)
+    ruby-filemagic (0.7.2)
     ruby-graphviz (1.2.3)
     rubycas-client (2.3.9)
       activesupport
@@ -490,6 +515,7 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
+    sixarm_ruby_unaccent (1.2.0)
     slim (3.0.7)
       temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
@@ -498,6 +524,8 @@ GEM
       railties (>= 3.1)
       slim (~> 3.0)
     slop (3.6.0)
+    sort_alphabetical (1.1.0)
+      unicode_utils (>= 1.2.2)
     spring (2.0.1)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
@@ -521,7 +549,7 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.19.4)
+    thor (0.20.0)
     thread (0.2.2)
     thread_safe (0.3.6)
     tilt (1.4.1)
@@ -533,19 +561,20 @@ GEM
       json (>= 1.8, < 3.0)
       parser (>= 2.3.0.7)
       rainbow (>= 1.99.1, < 3.0)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicode-display_width (1.3.0)
+    unicode_utils (1.4.0)
     warden (1.2.7)
       rack (>= 1.0)
     webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.0.2)
+    webpacker (3.2.1)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -586,6 +615,7 @@ DEPENDENCIES
   cocoon
   codifligne!
   coffee-rails (~> 4.0.0)
+  country_select
   cucumber-rails
   daemons
   database_cleaner
@@ -607,6 +637,7 @@ DEPENDENCIES
   faraday (~> 0.9.1)
   faraday_middleware (~> 0.9.1)
   ffaker (~> 2.1.0)
+  flag-icons-rails
   font-awesome-sass (~> 4.7)
   formtastic (= 3.1.5)
   georuby (= 2.3.0)
@@ -614,8 +645,8 @@ DEPENDENCIES
   google-analytics-rails
   gretel
   has_array_of!
-  hstore_accessor (~> 1.1)
   htmlbeautifier
+  i18n-js
   i18n-tasks
   inherited_resources
   jbuilder (~> 2.0)
@@ -639,6 +670,7 @@ DEPENDENCIES
   pundit
   quiet_assets
   rabl
+  rack-livereload
   rails (~> 4.2.8)
   rails-assets-bootstrap-sass-official (~> 3.3.0)!
   rails-assets-footable (~> 2.0.3)!
@@ -658,6 +690,7 @@ DEPENDENCIES
   rgeo (~> 0.5.2)
   roo
   rspec-rails (~> 3.5.0)
+  rspec-snapshot
   rubyzip
   sass-rails (~> 4.0.3)
   sawyer (~> 0.6.0)
@@ -680,10 +713,10 @@ DEPENDENCIES
   transpec
   uglifier (~> 2.7.2)
   webmock
-  webpacker (~> 3.0)
+  webpacker (= 3.2.1)
   whenever!
   will_paginate
   will_paginate-bootstrap
 
 BUNDLED WITH
-   1.15.4
+   1.16.1