Skip to content

Commit e8304e6

Browse files
committed
Bring rapid7#6793 up to date with upstream-master
2 parents 6ae4d15 + 8156859 commit e8304e6

File tree

258 files changed

+9796
-2280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+9796
-2280
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.9
1+
2.3.1

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ addons:
1010
- graphviz
1111
language: ruby
1212
rvm:
13-
- '2.1.8'
13+
- '2.3.1'
1414

1515
env:
1616
- RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ end
2525

2626
group :development, :test do
2727
# automatically include factories from spec/factories
28-
gem 'factory_girl_rails', '~> 4.5.0'
28+
gem 'factory_girl_rails'
2929
# Make rspec output shorter and more useful
30-
gem 'fivemat', '~> 1.3.1'
30+
gem 'fivemat'
3131
# running documentation generation tasks and rspec tasks
32-
gem 'rake', '>= 10.0.0'
32+
gem 'rake'
3333
# Define `rake spec`. Must be in development AND test so that its available by default as a rake test when the
3434
# environment is development
35-
gem 'rspec-rails' , '~> 3.3'
35+
gem 'rspec-rails'
3636
end
3737

3838
group :test do

0 commit comments

Comments
 (0)