Merge branch 'development'

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '2.4.4'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '5.2.0'
+gem 'rails', '5.1.6'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', :group => :development
 

Gemfile.lock

@@ -1,49 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
+    actioncable (5.1.6)
-      actionpack (= 5.2.0)
+      actionpack (= 5.1.6)
       nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
+      websocket-driver (~> 0.6.1)
-    actionmailer (5.2.0)
+    actionmailer (5.1.6)
-      actionpack (= 5.2.0)
+      actionpack (= 5.1.6)
-      actionview (= 5.2.0)
+      actionview (= 5.1.6)
-      activejob (= 5.2.0)
+      activejob (= 5.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
+    actionpack (5.1.6)
-      actionview (= 5.2.0)
+      actionview (= 5.1.6)
-      activesupport (= 5.2.0)
+      activesupport (= 5.1.6)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
+    actionview (5.1.6)
-      activesupport (= 5.2.0)
+      activesupport (= 5.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
+    activejob (5.1.6)
-      activesupport (= 5.2.0)
+      activesupport (= 5.1.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
+    activemodel (5.1.6)
-      activesupport (= 5.2.0)
+      activesupport (= 5.1.6)
-    activerecord (5.2.0)
+    activerecord (5.1.6)
-      activemodel (= 5.2.0)
+      activemodel (= 5.1.6)
-      activesupport (= 5.2.0)
+      activesupport (= 5.1.6)
-      arel (>= 9.0)
+      arel (~> 8.0)
-    activestorage (5.2.0)
+    activesupport (5.1.6)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
-      marcel (~> 0.3.1)
-    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (9.0.0)
+    arel (8.0.0)
     ast (2.4.0)
     backports (3.11.3)
     bcrypt (3.1.12)
@@ -60,7 +56,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    commander (4.4.5)
+    commander (4.4.6)
       highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
@@ -128,13 +124,10 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
-      mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
@@ -144,7 +137,7 @@ GEM
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     netrc (0.11.0)
-    newrelic_rpm (5.2.0.345)
+    newrelic_rpm (5.3.0.346)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
@@ -152,7 +145,7 @@ GEM
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
-    passenger (5.3.3)
+    passenger (5.3.4)
       rack
       rake (>= 0.8.1)
     powerpack (0.1.2)
@@ -163,18 +156,17 @@ GEM
     rack (2.0.5)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.0)
+    rails (5.1.6)
-      actioncable (= 5.2.0)
+      actioncable (= 5.1.6)
-      actionmailer (= 5.2.0)
+      actionmailer (= 5.1.6)
-      actionpack (= 5.2.0)
+      actionpack (= 5.1.6)
-      actionview (= 5.2.0)
+      actionview (= 5.1.6)
-      activejob (= 5.2.0)
+      activejob (= 5.1.6)
-      activemodel (= 5.2.0)
+      activemodel (= 5.1.6)
-      activerecord (= 5.2.0)
+      activerecord (= 5.1.6)
-      activestorage (= 5.2.0)
+      activesupport (= 5.1.6)
-      activesupport (= 5.2.0)
       bundler (>= 1.3.0)
-      railties (= 5.2.0)
+      railties (= 5.1.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -186,9 +178,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.2.0)
+    railties (5.1.6)
-      actionpack (= 5.2.0)
+      actionpack (= 5.1.6)
-      activesupport (= 5.2.0)
+      activesupport (= 5.1.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -251,7 +243,7 @@ GEM
       thread_safe (~> 0.1)
     tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
-    uglifier (4.1.16)
+    uglifier (4.1.17)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
@@ -261,7 +253,7 @@ GEM
     warden (1.2.7)
       rack (>= 1.0)
     websocket (1.2.8)
-    websocket-driver (0.7.0)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
 
@@ -284,7 +276,7 @@ DEPENDENCIES
   newrelic_rpm
   passenger
   puma
-  rails (= 5.2.0)
+  rails (= 5.1.6)
   rails_12factor
   rb-readline
   round_robin_tournament