Skip to content

Commit 22d08fd

Browse files
committed
Revert rapid7#6748, premature Gemfile* changes
1 parent 1162a06 commit 22d08fd

File tree

6 files changed

+162
-355
lines changed

6 files changed

+162
-355
lines changed

Gemfile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ source 'https://rubygems.org'
33
# spec.add_runtime_dependency '<name>', [<version requirements>]
44
gemspec name: 'metasploit-framework'
55

6-
# rails-upgrade staging gems
7-
gem 'metasploit-yard', github: 'rapid7/metasploit-yard', branch: 'staging/rails-upgrade'
8-
gem 'metasploit-erd', github: 'rapid7/metasploit-erd', branch: 'staging/rails-upgrade'
9-
gem 'yard-metasploit-erd', github: 'rapid7/yard-metasploit-erd', branch: 'staging/rails-upgrade'
10-
gem 'metasploit-concern', github: 'rapid7/metasploit-concern', branch: 'staging/rails-upgrade'
11-
gem 'metasploit-model', github: 'rapid7/metasploit-model', branch: 'staging/rails-upgrade'
12-
gem 'metasploit_data_models', github: 'rapid7/metasploit_data_models', branch: 'staging/rails-upgrade'
13-
gem 'metasploit-credential', github: 'rapid7/metasploit-credential', branch: 'staging/rails-upgrade'
14-
156
# separate from test as simplecov is not run on travis-ci
167
group :coverage do
178
# code coverage for tests
@@ -34,14 +25,14 @@ end
3425

3526
group :development, :test do
3627
# automatically include factories from spec/factories
37-
gem 'factory_girl_rails'
28+
gem 'factory_girl_rails', '~> 4.5.0'
3829
# Make rspec output shorter and more useful
39-
gem 'fivemat'
30+
gem 'fivemat', '~> 1.3.1'
4031
# running documentation generation tasks and rspec tasks
41-
gem 'rake'
32+
gem 'rake', '>= 10.0.0'
4233
# Define `rake spec`. Must be in development AND test so that its available by default as a rake test when the
4334
# environment is development
44-
gem 'rspec-rails'
35+
gem 'rspec-rails' , '~> 3.3'
4536
end
4637

4738
group :test do

0 commit comments

Comments
 (0)