Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c6a7f3d
)
(MODULES-3983) Update parallel_tests for ruby 2.0.0
Paula_modulesync
author
Paula McMaw
<paula@puppet.com>
Thu, 20 Oct 2016 08:47:24 +0000
(09:47 +0100)
committer
Paula McMaw
<paula@puppet.com>
Thu, 20 Oct 2016 08:47:24 +0000
(09:47 +0100)
Gemfile
patch
|
blob
|
history
diff --git
a/Gemfile
b/Gemfile
index c97275bd828700b2148ee9557223f6861f15b299..8222ef0a7af80dd54658f155125a2f828c30a831 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-24,7
+24,8
@@
group :development, :unit_tests do
gem 'rspec-puppet', '>= 2.3.2'
gem 'rspec-puppet-facts'
gem 'simplecov'
gem 'rspec-puppet', '>= 2.3.2'
gem 'rspec-puppet-facts'
gem 'simplecov'
- gem 'parallel_tests'
+ gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
+ gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
gem 'rubocop' if RUBY_VERSION >= '2.0.0'
gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
gem 'rubocop' if RUBY_VERSION >= '2.0.0'
gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'