Skip to content

Commit 00a254e

Browse files
committed
Specify rdoc version when Ruby version is under 2.2 on generated_app
Because of ruby/rdoc@51b03c3
1 parent d920c30 commit 00a254e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

example_app_generator/generate_app.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@
2323
gsub_file "Gemfile", /.*debugger.*/, ''
2424
gsub_file "Gemfile", /.*byebug.*/, "gem 'byebug', '~> 9.0.6'"
2525
gsub_file "Gemfile", /.*puma.*/, ""
26+
<<<<<<< HEAD
2627
if RUBY_VERSION < '2.2.2'
2728
gsub_file "Gemfile", /.*rdoc.*/, "gem 'rdoc', '< 6'"
2829
end
30+
=======
31+
gsub_file "Gemfile", /.*rdoc.*/, "gem 'rdoc', '< 6.0.4'"
32+
>>>>>>> Specify rdoc version when Ruby version is under 2.2 on generated_app
2933

3034
if Rails::VERSION::STRING >= '5.0.0'
3135
append_to_file('Gemfile', "gem 'rails-controller-testing', :git => 'https://github.com/rails/rails-controller-testing'\n")
@@ -57,11 +61,6 @@
5761
| gem 'mime-types', '< 3'
5862
|end
5963
|
60-
|# Version 6.0.4 of rdoc requires Ruby 2.2
61-
|if RUBY_VERSION < '2.2'
62-
| gem 'rdoc', '< 6.0.4'
63-
|end
64-
|
6564
|gem 'rspec-rails',
6665
| :path => '#{rspec_rails_repo_path}',
6766
| :groups => [:development, :test]

0 commit comments

Comments
 (0)