File tree Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Original file line number Diff line number Diff line change 23
23
gsub_file "Gemfile" , /.*debugger.*/ , ''
24
24
gsub_file "Gemfile" , /.*byebug.*/ , "gem 'byebug', '~> 9.0.6'"
25
25
gsub_file "Gemfile" , /.*puma.*/ , ""
26
+ <<<<<<< HEAD
26
27
if RUBY_VERSION < '2.2.2'
27
28
gsub_file "Gemfile" , /.*rdoc.*/ , "gem 'rdoc', '< 6'"
28
29
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
29
33
30
34
if Rails ::VERSION ::STRING >= '5.0.0'
31
35
append_to_file ( 'Gemfile' , "gem 'rails-controller-testing', :git => 'https://github.com/rails/rails-controller-testing'\n " )
57
61
| gem 'mime-types', '< 3'
58
62
|end
59
63
|
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
- |
65
64
|gem 'rspec-rails',
66
65
| :path => '#{ rspec_rails_repo_path } ',
67
66
| :groups => [:development, :test]
You can’t perform that action at this time.
0 commit comments