From 4585f35b5a9c1e4d3ecf0a9a1942275b66c4d4c7 Mon Sep 17 00:00:00 2001 From: BradPotts Date: Mon, 19 Jun 2017 10:31:47 +0800 Subject: [PATCH] updated dependencies and db migration files. --- Gemfile.lock | 74 +++++++++---------- ...20140621030847_create_mtwarden_accounts.rb | 2 +- ...14149_add_owner_id_to_mtwarden_accounts.rb | 2 +- .../20140621114231_create_mtwarden_users.rb | 2 +- .../20140621114308_create_mtwarden_members.rb | 2 +- ...4417_add_subdomain_to_mtwarden_accounts.rb | 2 +- .../20140829231923_create_mtwarden_plans.rb | 2 +- ...011033_add_plan_id_to_mtwarden_accounts.rb | 2 +- ...ee_subscription_id_to_mtwarden_accounts.rb | 2 +- lib/mtwarden/version.rb | 2 +- mtwarden.gemspec | 22 +++--- 11 files changed, 56 insertions(+), 58 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index def1697..f50ef18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - mtwarden (6.1.2) + mtwarden (7.0.0) bcrypt (~> 3.1, >= 3.1.11) bootstrap-sass (~> 3.3, >= 3.3.7) braintree (~> 2.76) @@ -18,19 +18,19 @@ PATH multi_json (~> 1.12, >= 1.12.1) oj (~> 3.0, >= 3.0.11) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) - phcadmin1 (~> 10.3, >= 10.3.1) - phcadmin2 (~> 8.3, >= 8.3.1) - phcadmin3 (~> 5.3, >= 5.3.1) - phcnotifi (~> 6.1, >= 6.1.2) - phctheme1 (~> 14.3, >= 14.3.1) - phctheme2 (~> 5.3, >= 5.3.1) - phctitleseo (~> 7.1, >= 7.1.2) + pg (~> 0.21.0) + phcadmin1 (~> 10.4) + phcadmin2 (~> 8.4) + phcadmin3 (~> 5.4) + phcnotifi (~> 6.2) + phctheme1 (~> 14.4) + phctheme2 (~> 5.6) + phctitleseo (~> 7.2) rabl (~> 0.13.1) rails (~> 5.1, >= 5.1.1) responders (~> 2.4) sass-rails (~> 5.0, >= 5.0.6) - tinymce-rails (~> 4.6, >= 4.6.3) + tinymce-rails (~> 4.6, >= 4.6.4) warden (~> 1.2, >= 1.2.7) webpacker (~> 2.0) @@ -77,7 +77,7 @@ GEM addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) arel (8.0.0) - autoprefixer-rails (7.1.1) + autoprefixer-rails (7.1.1.2) execjs aws_cf_signer (0.1.3) bcrypt (3.1.11) @@ -88,7 +88,7 @@ GEM builder (>= 2.0.0) builder (3.2.3) byebug (9.0.6) - capybara (2.14.0) + capybara (2.14.3) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -171,12 +171,12 @@ GEM nio4r (2.1.0) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) - oj (3.1.0) + oj (3.1.4) paper_trail (7.0.3) activerecord (>= 4.0, < 5.2) request_store (~> 1.1) - pg (0.20.0) - phcadmin1 (10.3.1) + pg (0.21.0) + phcadmin1 (10.4.0) bootstrap-sass (~> 3.3, >= 3.3.7) country_select (~> 3.0) font-awesome-rails (~> 4.7, >= 4.7.0.2) @@ -184,12 +184,12 @@ GEM jquery-rails (~> 4.3, >= 4.3.1) jquery-ui-rails (~> 6.0, >= 6.0.1) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) + pg (~> 0.21.0) rails (~> 5.1, >= 5.1.1) sass-rails (~> 5.0, >= 5.0.6) - tinymce-rails (~> 4.6, >= 4.6.3) + tinymce-rails (~> 4.6, >= 4.6.4) webpacker (~> 2.0) - phcadmin2 (8.3.1) + phcadmin2 (8.4.0) bootstrap-sass (~> 3.3, >= 3.3.7) country_select (~> 3.0) font-awesome-rails (~> 4.7, >= 4.7.0.2) @@ -197,12 +197,12 @@ GEM jquery-rails (~> 4.3, >= 4.3.1) jquery-ui-rails (~> 6.0, >= 6.0.1) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) + pg (~> 0.21.0) rails (~> 5.1, >= 5.1.1) sass-rails (~> 5.0, >= 5.0.6) - tinymce-rails (~> 4.6, >= 4.6.3) + tinymce-rails (~> 4.6, >= 4.6.4) webpacker (~> 2.0) - phcadmin3 (5.3.1) + phcadmin3 (5.4.0) bootstrap-sass (~> 3.3, >= 3.3.7) country_select (~> 3.0) font-awesome-rails (~> 4.7, >= 4.7.0.2) @@ -210,22 +210,22 @@ GEM jquery-rails (~> 4.3, >= 4.3.1) jquery-ui-rails (~> 6.0, >= 6.0.1) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) + pg (~> 0.21.0) rails (~> 5.1, >= 5.1.1) sass-rails (~> 5.0, >= 5.0.6) tinymce-rails (~> 4.6, >= 4.6.3) webpacker (~> 2.0) - phcnotifi (6.1.2) + phcnotifi (6.2.0) bootstrap-sass (~> 3.3, >= 3.3.7) font-awesome-rails (~> 4.7, >= 4.7.0.2) jquery-rails (~> 4.3, >= 4.3.1) jquery-ui-rails (~> 6.0, >= 6.0.1) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) + pg (~> 0.21.0) rails (~> 5.1, >= 5.1.1) sass-rails (~> 5.0, >= 5.0.6) webpacker (~> 2.0) - phctheme1 (14.3.1) + phctheme1 (14.4.0) bootstrap-sass (~> 3.3, >= 3.3.7) country_select (~> 3.0) font-awesome-rails (~> 4.7, >= 4.7.0.2) @@ -233,12 +233,12 @@ GEM jquery-rails (~> 4.3, >= 4.3.1) jquery-ui-rails (~> 6.0, >= 6.0.1) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) + pg (~> 0.21.0) rails (~> 5.1, >= 5.1.1) sass-rails (~> 5.0, >= 5.0.6) - tinymce-rails (~> 4.6, >= 4.6.3) + tinymce-rails (~> 4.6, >= 4.6.4) webpacker (~> 2.0) - phctheme2 (5.3.1) + phctheme2 (5.6.0) bootstrap-sass (~> 3.3, >= 3.3.7) country_select (~> 3.0) font-awesome-rails (~> 4.7, >= 4.7.0.2) @@ -246,18 +246,18 @@ GEM jquery-rails (~> 4.3, >= 4.3.1) jquery-ui-rails (~> 6.0, >= 6.0.1) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) + pg (~> 0.21.0) rails (~> 5.1, >= 5.1.1) sass-rails (~> 5.0, >= 5.0.6) - tinymce-rails (~> 4.6, >= 4.6.3) + tinymce-rails (~> 4.6, >= 4.6.4) webpacker (~> 2.0) - phctitleseo (7.1.2) + phctitleseo (7.2.0) bootstrap-sass (~> 3.3, >= 3.3.7) font-awesome-rails (~> 4.7, >= 4.7.0.2) jquery-rails (~> 4.3, >= 4.3.1) jquery-ui-rails (~> 6.0, >= 6.0.1) paper_trail (~> 7.0, >= 7.0.3) - pg (~> 0.20.0) + pg (~> 0.21.0) rails (~> 5.1, >= 5.1.1) sass-rails (~> 5.0, >= 5.0.6) webpacker (~> 2.0) @@ -324,10 +324,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (3.4.0) + selenium-webdriver (3.4.3) childprocess (~> 0.5) rubyzip (~> 1.0) - websocket (~> 1.0) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) simplecov (0.14.1) @@ -349,7 +348,7 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.7) - tinymce-rails (4.6.3) + tinymce-rails (4.6.4) railties (>= 3.1.1) tzinfo (1.2.3) thread_safe (~> 0.1) @@ -363,7 +362,6 @@ GEM activesupport (>= 4.2) multi_json (~> 1.2) railties (>= 4.2) - websocket (1.2.4) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -375,7 +373,7 @@ PLATFORMS DEPENDENCIES byebug (~> 9.0, >= 9.0.6) - capybara (~> 2.14) + capybara (~> 2.14, >= 2.14.3) database_cleaner (~> 1.6, >= 1.6.1) factory_girl_rails (~> 4.8) faker (~> 1.7, >= 1.7.3) @@ -386,7 +384,7 @@ DEPENDENCIES mtwarden! nokogiri (~> 1.8) rspec-rails (~> 3.6) - selenium-webdriver (~> 3.4) + selenium-webdriver (~> 3.4, >= 3.4.3) shoulda-matchers (~> 3.1, >= 3.1.1) simplecov (~> 0.14.1) sqlite3 (~> 1.3, >= 1.3.13) diff --git a/db/migrate/20140621030847_create_mtwarden_accounts.rb b/db/migrate/20140621030847_create_mtwarden_accounts.rb index 5ce7e71..17cd608 100644 --- a/db/migrate/20140621030847_create_mtwarden_accounts.rb +++ b/db/migrate/20140621030847_create_mtwarden_accounts.rb @@ -1,4 +1,4 @@ -class CreateMtwardenAccounts < ActiveRecord::Migration[5.0] +class CreateMtwardenAccounts < ActiveRecord::Migration[5.1] def change create_table :mtwarden_accounts do |t| diff --git a/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb b/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb index 9e6aa73..5cf4d50 100644 --- a/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb +++ b/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb @@ -1,4 +1,4 @@ -class AddOwnerIdToMtwardenAccounts < ActiveRecord::Migration[5.0] +class AddOwnerIdToMtwardenAccounts < ActiveRecord::Migration[5.1] def change add_column :mtwarden_accounts, :owner_id, :integer diff --git a/db/migrate/20140621114231_create_mtwarden_users.rb b/db/migrate/20140621114231_create_mtwarden_users.rb index 8a44fe8..1398e3b 100644 --- a/db/migrate/20140621114231_create_mtwarden_users.rb +++ b/db/migrate/20140621114231_create_mtwarden_users.rb @@ -1,4 +1,4 @@ -class CreateMtwardenUsers < ActiveRecord::Migration[5.0] +class CreateMtwardenUsers < ActiveRecord::Migration[5.1] def change create_table :mtwarden_users do |t| diff --git a/db/migrate/20140621114308_create_mtwarden_members.rb b/db/migrate/20140621114308_create_mtwarden_members.rb index 684d9ef..35c363c 100644 --- a/db/migrate/20140621114308_create_mtwarden_members.rb +++ b/db/migrate/20140621114308_create_mtwarden_members.rb @@ -1,4 +1,4 @@ -class CreateMtwardenMembers < ActiveRecord::Migration[5.0] +class CreateMtwardenMembers < ActiveRecord::Migration[5.1] def change create_table :mtwarden_members do |t| diff --git a/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb b/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb index c430f56..307f1a8 100644 --- a/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb +++ b/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb @@ -1,4 +1,4 @@ -class AddSubdomainToMtwardenAccounts < ActiveRecord::Migration[5.0] +class AddSubdomainToMtwardenAccounts < ActiveRecord::Migration[5.1] def change add_column :mtwarden_accounts, :subdomain, :string diff --git a/db/migrate/20140829231923_create_mtwarden_plans.rb b/db/migrate/20140829231923_create_mtwarden_plans.rb index 3d13ff7..b243739 100644 --- a/db/migrate/20140829231923_create_mtwarden_plans.rb +++ b/db/migrate/20140829231923_create_mtwarden_plans.rb @@ -1,4 +1,4 @@ -class CreateMtwardenPlans < ActiveRecord::Migration[5.0] +class CreateMtwardenPlans < ActiveRecord::Migration[5.1] def change create_table :mtwarden_plans do |t| diff --git a/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb b/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb index 6ec44dd..9b65dd0 100644 --- a/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb +++ b/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb @@ -1,4 +1,4 @@ -class AddPlanIdToMtwardenAccounts < ActiveRecord::Migration[5.0] +class AddPlanIdToMtwardenAccounts < ActiveRecord::Migration[5.1] def change add_column :mtwarden_accounts, :plan_id, :integer diff --git a/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb b/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb index c7b6a6a..2ef8f15 100644 --- a/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb +++ b/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb @@ -1,4 +1,4 @@ -class AddBraintreeSubscriptionIdToMtwardenAccounts < ActiveRecord::Migration[5.0] +class AddBraintreeSubscriptionIdToMtwardenAccounts < ActiveRecord::Migration[5.1] def change add_column :mtwarden_accounts, :braintree_subscription_id, :string diff --git a/lib/mtwarden/version.rb b/lib/mtwarden/version.rb index 29ec033..eae3891 100644 --- a/lib/mtwarden/version.rb +++ b/lib/mtwarden/version.rb @@ -1,3 +1,3 @@ module Mtwarden - VERSION = '6.1.2' + VERSION = '7.0.0' end diff --git a/mtwarden.gemspec b/mtwarden.gemspec index d5a4aa9..733465a 100644 --- a/mtwarden.gemspec +++ b/mtwarden.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| # Main Dependencies spec.add_dependency 'rails', '~> 5.1', '>= 5.1.1' - spec.add_dependency 'pg', '~> 0.20.0' + spec.add_dependency 'pg', '~> 0.21.0' spec.add_dependency 'paper_trail', '~> 7.0', '>= 7.0.3' # UI & Frontend Dependencies @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'webpacker', '~> 2.0' # WYSIWYG Editor Dependencies - spec.add_dependency 'tinymce-rails', '~> 4.6', '>= 4.6.3' + spec.add_dependency 'tinymce-rails', '~> 4.6', '>= 4.6.4' # API Dependencies spec.add_dependency 'oj', '~> 3.0', '>= 3.0.11' @@ -50,17 +50,17 @@ Gem::Specification.new do |spec| spec.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.1' # PHCEngine Dependencies - spec.add_dependency 'phctitleseo', '~> 7.1', '>= 7.1.2' - spec.add_dependency 'phcnotifi', '~> 6.1', '>= 6.1.2' + spec.add_dependency 'phctitleseo', '~> 7.2' + spec.add_dependency 'phcnotifi', '~> 6.2' # PHCTheme Dependencies - spec.add_dependency 'phctheme1', '~> 14.3', '>= 14.3.1' - spec.add_dependency 'phctheme2', '~> 5.3', '>= 5.3.1' + spec.add_dependency 'phctheme1', '~> 14.4' + spec.add_dependency 'phctheme2', '~> 5.6' # PHCAdmin Dependencies - spec.add_dependency 'phcadmin1', '~> 10.3', '>= 10.3.1' - spec.add_dependency 'phcadmin2', '~> 8.3', '>= 8.3.1' - spec.add_dependency 'phcadmin3', '~> 5.3', '>= 5.3.1' + spec.add_dependency 'phcadmin1', '~> 10.4' + spec.add_dependency 'phcadmin2', '~> 8.4' + spec.add_dependency 'phcadmin3', '~> 5.4' # Security, Subscriptions & Forms spec.add_dependency 'bcrypt', '~> 3.1', '>= 3.1.11' @@ -72,7 +72,7 @@ Gem::Specification.new do |spec| # Development & Testing Dependencies spec.add_development_dependency 'rspec-rails', '~> 3.6' spec.add_development_dependency 'factory_girl_rails', '~> 4.8' - spec.add_development_dependency 'capybara', '~> 2.14' + spec.add_development_dependency 'capybara', '~> 2.14', '>= 2.14.3' spec.add_development_dependency 'nokogiri', '~> 1.8' spec.add_development_dependency 'byebug', '~> 9.0', '>= 9.0.6' @@ -81,7 +81,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'faker', '~> 1.7', '>= 1.7.3' spec.add_development_dependency 'launchy', '~> 2.4', '>= 2.4.3' - spec.add_development_dependency 'selenium-webdriver', '~> 3.4' + spec.add_development_dependency 'selenium-webdriver', '~> 3.4', '>= 3.4.3' # Extra Development & Testing Dependencies spec.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.2'