Skip to content

Commit fb3b6f5

Browse files
author
Tod Beardsley
committed
Land rapid7#3279, upper bound check for AR
2 parents 1353c62 + 97ef53a commit fb3b6f5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
# Need 3+ for ActiveSupport::Concern
4-
gem 'activesupport', '>= 3.0.0'
4+
gem 'activesupport', '>= 3.0.0', '< 4.0.0'
55
# Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
66
gem 'bcrypt'
77
# Needed for some admin modules (scrutinizer_add_user.rb)
@@ -19,7 +19,7 @@ gem 'packetfu', '1.1.9'
1919

2020
group :db do
2121
# Needed for Msf::DbManager
22-
gem 'activerecord'
22+
gem 'activerecord', '>= 3.0.0', '< 4.0.0'
2323
# Database models shared between framework and Pro.
2424
gem 'metasploit_data_models', '~> 0.17.0'
2525
# Needed for module caching in Mdm::ModuleDetails

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ PLATFORMS
6161
ruby
6262

6363
DEPENDENCIES
64-
activerecord
65-
activesupport (>= 3.0.0)
64+
activerecord (>= 3.0.0, < 4.0.0)
65+
activesupport (>= 3.0.0, < 4.0.0)
6666
bcrypt
6767
database_cleaner
6868
factory_girl (>= 4.1.0)

0 commit comments

Comments
 (0)