prep for Rails 5.1

several gem bumps for versions compatible with rails 5.1, and loosening
requirements on in-repo gems.

Change-Id: I4849b053690527e812bb1042fde8142520452123
Reviewed-on: https://gerrit.instructure.com/115650
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2017-06-14 22:00:51 -06:00
parent 43485101fd
commit 68f5e6065c
25 changed files with 34 additions and 32 deletions

View File

@ -26,21 +26,21 @@ else
gem 'oauth2', '1.2.0', require: false gem 'oauth2', '1.2.0', require: false
end end
gem 'rails-observers', github: 'rails/rails-observers', ref: '3fe157d6cbb5b5e767ded248009fc59443d63fa1' gem 'rails-observers', '0.1.4', github: 'rails/rails-observers', ref: '206cb17bc14f4f5ac6f83da4204013a69549b9dc'
gem 'builder', '3.2.3' gem 'builder', '3.2.3'
gem 'tzinfo', '1.2.2' gem 'tzinfo', '1.2.2'
gem 'oj_mimic_json', require: false gem 'oj_mimic_json', require: false
gem 'encrypted_cookie_store-instructure', '1.2.4', require: 'encrypted_cookie_store' gem 'encrypted_cookie_store-instructure', '1.2.5', require: 'encrypted_cookie_store'
gem 'active_model_serializers', '0.9.0alpha1', gem 'active_model_serializers', '0.9.0alpha1',
github: 'rails-api/active_model_serializers', ref: '61882e1e4127facfe92e49057aec71edbe981829' github: 'rails-api/active_model_serializers', ref: '61882e1e4127facfe92e49057aec71edbe981829'
gem 'authlogic', '3.5.0' gem 'authlogic', '3.6.0'
gem 'scrypt', '3.0.5' gem 'scrypt', '3.0.5'
gem 'active_model-better_errors', '1.6.7', require: 'active_model/better_errors' gem 'active_model-better_errors', '1.6.7', require: 'active_model/better_errors'
gem 'dynamic_form', '1.1.4', require: false gem 'dynamic_form', '1.1.4', require: false
gem 'rails-patch-json-encode', '0.0.1' gem 'rails-patch-json-encode', '0.0.1'
gem 'switchman', '1.9.12' gem 'switchman', '1.10.1'
gem 'open4', '1.3.4', require: false gem 'open4', '1.3.4', require: false
gem 'folio-pagination', '0.0.12', require: 'folio/rails' gem 'folio-pagination', '0.0.12', require: 'folio/rails'
# for folio, see the folio README # for folio, see the folio README
@ -99,13 +99,13 @@ gem 'rotp', '3.3.0', require: false
gem 'net-ldap', '0.10.1', require: false gem 'net-ldap', '0.10.1', require: false
gem 'ruby-duration', '3.2.3', require: false gem 'ruby-duration', '3.2.3', require: false
gem 'ruby-saml-mod', '0.3.5' gem 'ruby-saml-mod', '0.3.5'
gem 'saml2', '1.1.0', require: false gem 'saml2', '1.1.1', require: false
gem 'nokogiri-xmlsec-me-harder', '0.9.3pre', require: false, github: 'instructure/nokogiri-xmlsec-me-harder', ref: '57d071040cc4649db9f158e09bbcea028271a4a6' gem 'nokogiri-xmlsec-me-harder', '0.9.3pre', require: false, github: 'instructure/nokogiri-xmlsec-me-harder', ref: '57d071040cc4649db9f158e09bbcea028271a4a6'
gem 'rubycas-client', '2.3.9', require: false gem 'rubycas-client', '2.3.9', require: false
gem 'rubyzip', '1.2.0', require: 'zip' gem 'rubyzip', '1.2.0', require: 'zip'
gem 'safe_yaml', '1.0.4', require: false gem 'safe_yaml', '1.0.4', require: false
gem 'sanitize', '2.1.0', require: false gem 'sanitize', '2.1.0', require: false
gem 'shackles', '1.3.0' gem 'shackles', '1.4.0'
gem 'useragent', '0.16.8', require: false gem 'useragent', '0.16.8', require: false
@ -114,7 +114,7 @@ gem 'hey', '1.3.0', require: false
gem 'sentry-raven', '0.15.6', require: false gem 'sentry-raven', '0.15.6', require: false
gem 'canvas_statsd', '2.0.4' gem 'canvas_statsd', '2.0.4'
gem 'statsd-ruby', '1.4.0', require: false gem 'statsd-ruby', '1.4.0', require: false
gem 'aroi', '0.0.4', require: false gem 'aroi', '0.0.5', require: false
gem 'gepub', '0.7.0beta3', github: 'ccutrer/gepub', ref: '7cea2f4912f15d89bc9e9cb9d4c51e5f491c2328' gem 'gepub', '0.7.0beta3', github: 'ccutrer/gepub', ref: '7cea2f4912f15d89bc9e9cb9d4c51e5f491c2328'
gem 'imperium', '0.1.3', require: false gem 'imperium', '0.1.3', require: false
gem 'academic_benchmarks', '0.0.9', require: false gem 'academic_benchmarks', '0.0.9', require: false

View File

@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency 'rails', ">= 3.2", "< 5.1" spec.add_dependency 'rails', ">= 3.2", "< 5.2"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"
spec.add_development_dependency "sqlite3" spec.add_development_dependency "sqlite3"

View File

@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency 'rails', ">= 3.2", "< 5.1" spec.add_dependency 'rails', ">= 3.2", "< 5.2"
spec.add_dependency 'canvas_statsd', "~> 2.0" spec.add_dependency 'canvas_statsd', "~> 2.0"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"

View File

@ -15,5 +15,5 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*"] s.files = Dir["{app,config,db,lib}/**/*"]
s.test_files = Dir["spec_canvas/**/*"] s.test_files = Dir["spec_canvas/**/*"]
s.add_dependency "rails", ">= 3.2", "< 5.1" s.add_dependency "rails", ">= 3.2", "< 5.2"
end end

View File

@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "byebug" spec.add_development_dependency "byebug"
spec.add_development_dependency "minitest" spec.add_development_dependency "minitest"
spec.add_development_dependency "rake" spec.add_development_dependency "rake"
spec.add_development_dependency "activesupport", "<5.1" spec.add_development_dependency "activesupport", "< 5.2"
end end

View File

@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "folio-pagination", "~> 0.0.12" spec.add_dependency "folio-pagination", "~> 0.0.12"
spec.add_dependency "will_paginate", "~> 3.0" spec.add_dependency "will_paginate", "~> 3.0"
spec.add_dependency "rails", ">= 3.2", "< 5.1" spec.add_dependency "rails", ">= 3.2", "< 5.2"
spec.add_dependency "paginated_collection" spec.add_dependency "paginated_collection"
spec.add_dependency "json_token" spec.add_dependency "json_token"

View File

@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "tzinfo" spec.add_dependency "tzinfo"
spec.add_dependency "activesupport", ">= 3.2", "< 5.1" spec.add_dependency "activesupport", ">= 3.2", "< 5.2"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"
spec.add_development_dependency "rake" spec.add_development_dependency "rake"

View File

@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib'] spec.require_paths = ['lib']
spec.license = 'AGPL' spec.license = 'AGPL'
spec.add_dependency 'activerecord', '>= 3.2', '< 5.1' spec.add_dependency 'activerecord', '>= 3.2', '< 5.2'
spec.add_dependency 'pg', '~> 0.17' spec.add_dependency 'pg', '~> 0.17'
spec.add_development_dependency 'bundler', '~> 1.5' spec.add_development_dependency 'bundler', '~> 1.5'

View File

@ -18,7 +18,9 @@
require 'active_record/migration' require 'active_record/migration'
module CanvasPartman module CanvasPartman
class Migration < ActiveRecord::Migration parent = ActiveRecord::Migration.respond_to?(:[]) ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration
class Migration < parent
class << self class << self
# @attr [CanvasPartman::Partitioned] base_class # @attr [CanvasPartman::Partitioned] base_class
# The partitioned ActiveRecord::Base model _class_ we're modifying # The partitioned ActiveRecord::Base model _class_ we're modifying

View File

@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency 'rails', ">= 3.2", "< 5.1" spec.add_dependency 'rails', ">= 3.2", "< 5.2"
spec.add_development_dependency "activerecord" spec.add_development_dependency "activerecord"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"

View File

@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "tzinfo" spec.add_dependency "tzinfo"
spec.add_dependency "activesupport", ">= 3.2", "< 5.1" spec.add_dependency "activesupport", ">= 3.2", "< 5.2"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"
spec.add_development_dependency "rake" spec.add_development_dependency "rake"

View File

@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'json_token' spec.add_dependency 'json_token'
spec.add_dependency 'paginated_collection' spec.add_dependency 'paginated_collection'
spec.add_dependency 'rails', ">= 4.2", "< 5.1" spec.add_dependency 'rails', ">= 4.2", "< 5.2"
spec.add_development_dependency 'bundler', '~> 1.5' spec.add_development_dependency 'bundler', '~> 1.5'
spec.add_development_dependency 'rspec', "~> 3.5.0" spec.add_development_dependency 'rspec', "~> 3.5.0"

View File

@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "rails", ">= 3.2", "< 5.1" spec.add_dependency "rails", ">= 3.2", "< 5.2"
spec.add_runtime_dependency "google-api-client", "0.8.2" spec.add_runtime_dependency "google-api-client", "0.8.2"
spec.add_development_dependency "bundler", "~> 1.7" spec.add_development_dependency "bundler", "~> 1.7"

View File

@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'canvas_text_helper' spec.add_dependency 'canvas_text_helper'
spec.add_dependency 'iconv', '~> 1.0' spec.add_dependency 'iconv', '~> 1.0'
spec.add_dependency 'activesupport', ">= 3.2", "< 5.1" spec.add_dependency 'activesupport', ">= 3.2", "< 5.2"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"
spec.add_development_dependency "rspec", "~> 3.5.0" spec.add_development_dependency "rspec", "~> 3.5.0"

View File

@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "sexp_processor", "~> 4.2" spec.add_dependency "sexp_processor", "~> 4.2"
spec.add_dependency "ruby_parser", "~> 3.7" spec.add_dependency "ruby_parser", "~> 3.7"
spec.add_dependency "activesupport", ">= 3.2", "< 5.1" spec.add_dependency "activesupport", ">= 3.2", "< 5.2"
spec.add_dependency "i18nliner", "0.0.12" spec.add_dependency "i18nliner", "0.0.12"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"

View File

@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "activesupport", ">= 3.2", "< 5.1" spec.add_dependency "activesupport", ">= 3.2", "< 5.2"
spec.add_dependency "i18n", "~> 0.7.0" spec.add_dependency "i18n", "~> 0.7.0"
spec.add_dependency "ruby_parser", "~> 3.7" spec.add_dependency "ruby_parser", "~> 3.7"

View File

@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "activesupport", ">= 3.2", "< 5.1" spec.add_dependency "activesupport", ">= 3.2", "< 5.2"
spec.add_dependency "mail", "2.6.4" spec.add_dependency "mail", "2.6.4"
spec.add_dependency "html_text_helper" spec.add_dependency "html_text_helper"

View File

@ -13,6 +13,6 @@ Gem::Specification.new do |spec|
spec.files = Dir["{app,config,db,lib}/**/*"] spec.files = Dir["{app,config,db,lib}/**/*"]
spec.test_files = Dir["spec_canvas/**/*"] spec.test_files = Dir["spec_canvas/**/*"]
spec.add_dependency "rails", ">= 3.2", "< 5.1" spec.add_dependency "rails", ">= 3.2", "< 5.2"
spec.add_dependency "academic_benchmarks", "~> 0.0" spec.add_dependency "academic_benchmarks", "~> 0.0"
end end

View File

@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
spec.files = Dir["{app,config,db,lib}/**/*"] spec.files = Dir["{app,config,db,lib}/**/*"]
spec.test_files = Dir["spec_canvas/**/*"] spec.test_files = Dir["spec_canvas/**/*"]
spec.add_dependency "rails", ">= 3.2", "< 5.1" spec.add_dependency "rails", ">= 3.2", "< 5.2"
end end

View File

@ -16,6 +16,6 @@ Gem::Specification.new do |s|
s.files = Dir["{lib}/**/*"] s.files = Dir["{lib}/**/*"]
s.test_files = Dir["spec_canvas/**/*"] s.test_files = Dir["spec_canvas/**/*"]
s.add_dependency "rails", ">= 3.2", "< 5.1" s.add_dependency "rails", ">= 3.2", "< 5.2"
s.add_dependency "moodle2cc", "0.2.38" s.add_dependency "moodle2cc", "0.2.38"
end end

View File

@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
spec.files = Dir["{app,lib}/**/*"] spec.files = Dir["{app,lib}/**/*"]
spec.test_files = Dir["spec_canvas/**/*"] spec.test_files = Dir["spec_canvas/**/*"]
spec.add_dependency "rails", ">= 3.2", "< 5.1" spec.add_dependency "rails", ">= 3.2", "< 5.2"
end end

View File

@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*"] s.files = Dir["{app,config,db,lib}/**/*"]
s.test_files = Dir["spec_canvas/**/*"] s.test_files = Dir["spec_canvas/**/*"]
s.add_dependency "rails", ">= 3.2", "< 5.1" s.add_dependency "rails", ">= 3.2", "< 5.2"
s.add_dependency "soap4r-middleware", "0.8.3" s.add_dependency "soap4r-middleware", "0.8.3"
# in spite of the name, this fork of soap4r works with all rubies # in spite of the name, this fork of soap4r works with all rubies
s.add_dependency "soap4r-ruby1.9", "2.0.0" s.add_dependency "soap4r-ruby1.9", "2.0.0"

View File

@ -15,5 +15,5 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*"] s.files = Dir["{app,config,db,lib}/**/*"]
s.test_files = Dir["spec_canvas/**/*"] s.test_files = Dir["spec_canvas/**/*"]
s.add_dependency "rails", ">= 3.2", "< 5.1" s.add_dependency "rails", ">= 3.2", "< 5.2"
end end

View File

@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "aws-sdk-s3" spec.add_dependency "aws-sdk-s3"
spec.add_dependency "activesupport", ">= 3.2", "< 5.1" spec.add_dependency "activesupport", ">= 3.2", "< 5.2"
spec.add_dependency "activerecord", ">= 3.2", "< 5.1" spec.add_dependency "activerecord", ">= 3.2", "< 5.2"
spec.add_dependency "globby", ">= 0.1.2" spec.add_dependency "globby", ">= 0.1.2"
end end

View File

@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency 'rails', ">= 3.2", "< 5.1" spec.add_dependency 'rails', ">= 3.2", "< 5.2"
spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "bundler", "~> 1.5"
spec.add_development_dependency "rake" spec.add_development_dependency "rake"