From 590d2bdd49c60fc20b55f48b2eaa499e14747147 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sat, 19 Jan 2019 01:39:42 -0800
Subject: [PATCH] New version of webmock to fix error with ruby 2.6

---
 Gemfile                         | 18 +++++++++---------
 migrations/111_archiving_mod.rb | 13 +++++++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 migrations/111_archiving_mod.rb

diff --git a/Gemfile b/Gemfile
index b87fdd8f..bc7d2bd6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,20 +64,20 @@ end
 
 group :test do
   gem 'faker'
-  gem 'fabrication',           require: 'fabrication'
+  gem 'fabrication',                    require: 'fabrication'
   gem 'minitest'
-  gem 'minitest-reporters',    require: 'minitest/reporters'
-  gem 'rack-test',             require: 'rack/test'
-  gem 'mocha',                 require: nil
-  gem 'rake',                  require: nil
+  gem 'minitest-reporters',             require: 'minitest/reporters'
+  gem 'rack-test',                      require: 'rack/test'
+  gem 'mocha',                          require: nil
+  gem 'rake',                           require: nil
   gem 'poltergeist'
   gem 'capybara_minitest_spec'
-  gem 'capybara', require: nil #, '2.10.1',     require: nil
-  gem 'rack_session_access',   require: nil
-  gem 'webmock',               require: nil
+  gem 'capybara',                       require: nil #, '2.10.1',     require: nil
+  gem 'rack_session_access',            require: nil
+  gem 'webmock', '3.5.1',               require: nil
   gem 'stripe-ruby-mock', '2.5.6',      require: 'stripe_mock'
   gem 'timecop'
   gem 'mock_redis'
-  gem 'simplecov',        require: nil
+  gem 'simplecov',                      require: nil
   gem 'm'
 end
diff --git a/migrations/111_archiving_mod.rb b/migrations/111_archiving_mod.rb
new file mode 100644
index 00000000..79dce4dd
--- /dev/null
+++ b/migrations/111_archiving_mod.rb
@@ -0,0 +1,13 @@
+Sequel.migration do
+  up {
+    DB.drop_column :sites, :archiving_disabled
+    DB.drop_column :sites, :archiving_private
+    DB.add_column  :sites, :ipfs_archiving_enabled, :boolean, default: false
+  }
+
+  down {
+    DB.drop_column :sites, :ipfs_archiving_enabled
+    DB.add_column  :sites, :archiving_disabled, :boolean, default: false
+    DB.add_column  :sites, :archiving_private,  :boolean, default: false
+  }
+end