Merge pull request #300 from jasnow/master

cktricky · web-flow · commit 402ff40a5ab2 · 2018-02-01T10:05:21.000-05:00
Upgraded 7 gems plus added release number to db migrations
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -48,8 +48,8 @@ GEM
       ffi (~> 1.9.10)
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
-    ast (2.3.0)
-    backports (3.11.0)
+    ast (2.4.0)
+    backports (3.11.1)
     bcrypt (3.1.11)
     better_errors (2.4.0)
       coderay (>= 1.0.0)
@@ -153,7 +153,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
-    kgio (2.11.1)
+    kgio (2.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
@@ -170,13 +170,13 @@ GEM
     method_source (0.9.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.11.3)
     multi_json (1.13.1)
     multi_test (0.1.2)
     mysql2 (0.4.10)
     nenv (0.3.0)
     nio4r (2.2.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -198,7 +198,7 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.1)
-    rack (2.0.3)
+    rack (2.0.4)
     rack-livereload (0.3.16)
       rack
     rack-test (0.8.2)
@@ -257,7 +257,7 @@ GEM
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+    rspec-support (3.7.1)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
@@ -310,7 +310,7 @@ GEM
     turbolinks-source (5.1.0)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (4.1.4)
+    uglifier (4.1.5)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     unicorn (5.4.0)
diff --git a/db/migrate/20130424220355_create_users.rb b/db/migrate/20130424220355_create_users.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :email
diff --git a/db/migrate/20130524222129_create_retirements.rb b/db/migrate/20130524222129_create_retirements.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateRetirements < ActiveRecord::Migration
+class CreateRetirements < ActiveRecord::Migration[4.2]
   def change
     create_table :retirements do |t|
       t.string :total
diff --git a/db/migrate/20130525001150_create_paid_time_offs.rb b/db/migrate/20130525001150_create_paid_time_offs.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreatePaidTimeOffs < ActiveRecord::Migration
+class CreatePaidTimeOffs < ActiveRecord::Migration[4.2]
   def change
     create_table :paid_time_offs do |t|
       t.integer :user_id
diff --git a/db/migrate/20130527165832_create_schedules.rb b/db/migrate/20130527165832_create_schedules.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateSchedules < ActiveRecord::Migration
+class CreateSchedules < ActiveRecord::Migration[4.2]
   def change
     create_table :schedules do |t|
       t.string :event_type
diff --git a/db/migrate/20130531143853_create_work_infos.rb b/db/migrate/20130531143853_create_work_infos.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateWorkInfos < ActiveRecord::Migration
+class CreateWorkInfos < ActiveRecord::Migration[4.2]
   def change
     create_table :work_infos do |t|
       t.integer :user_id
diff --git a/db/migrate/20130531182058_create_performances.rb b/db/migrate/20130531182058_create_performances.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreatePerformances < ActiveRecord::Migration
+class CreatePerformances < ActiveRecord::Migration[4.2]
   def change
     create_table :performances do |t|
       t.integer :user_id
diff --git a/db/migrate/20130708202859_create_benefits.rb b/db/migrate/20130708202859_create_benefits.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateBenefits < ActiveRecord::Migration
+class CreateBenefits < ActiveRecord::Migration[4.2]
   def change
     create_table :benefits do |t|
 
diff --git a/db/migrate/20131011180207_create_messages.rb b/db/migrate/20131011180207_create_messages.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateMessages < ActiveRecord::Migration
+class CreateMessages < ActiveRecord::Migration[4.2]
   def change
     create_table :messages do |t|
       t.integer :creator_id
diff --git a/db/migrate/20131112235256_add_encrypted_ssn_to_work_infos.rb b/db/migrate/20131112235256_add_encrypted_ssn_to_work_infos.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class AddEncryptedSsnToWorkInfos < ActiveRecord::Migration
+class AddEncryptedSsnToWorkInfos < ActiveRecord::Migration[4.2]
   def change
     add_column :work_infos, :encrypted_ssn, :binary
   end
diff --git a/db/migrate/20131113200708_create_key_managements.rb b/db/migrate/20131113200708_create_key_managements.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateKeyManagements < ActiveRecord::Migration
+class CreateKeyManagements < ActiveRecord::Migration[4.2]
   def change
     create_table :key_managements do |t|
       t.string :iv
diff --git a/db/migrate/20140312002642_add_auth_token_to_users.rb b/db/migrate/20140312002642_add_auth_token_to_users.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class AddAuthTokenToUsers < ActiveRecord::Migration
+class AddAuthTokenToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :auth_token, :string
   end
diff --git a/db/migrate/20140315002730_create_pays.rb b/db/migrate/20140315002730_create_pays.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreatePays < ActiveRecord::Migration
+class CreatePays < ActiveRecord::Migration[4.2]
   def change
     create_table :pays do |t|
       t.integer :user_id
diff --git a/db/migrate/20140408185601_create_analytics.rb b/db/migrate/20140408185601_create_analytics.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateAnalytics < ActiveRecord::Migration
+class CreateAnalytics < ActiveRecord::Migration[4.2]
   def change
     create_table :analytics do |t|
       t.string		:ip_address
diff --git a/db/schema.rb b/db/schema.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
