diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-24 11:43:54 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-24 11:43:54 -0300 |
| commit | 9882f9e43cbaab9b173558338c931bd72baec470 (patch) | |
| tree | 8602b0ad9f2f2c268b8c4f098558c693d678d825 /railties/lib/rails | |
| parent | fee34594bed22b61831faacd84b8052929865836 (diff) | |
| parent | 46fedb478217a5bfbccd13ed87212e51f6e77469 (diff) | |
| download | rails-9882f9e43cbaab9b173558338c931bd72baec470.tar.gz rails-9882f9e43cbaab9b173558338c931bd72baec470.tar.bz2 rails-9882f9e43cbaab9b173558338c931bd72baec470.zip | |
Merge pull request #20265 from benpickles/gitignore-keeps
Omit .keep in .gitignore when generated with --skip-keeps.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 119a7cb829..061fafb156 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -174,6 +174,10 @@ module Rails options[value] ? '# ' : '' end + def keeps? + !options[:skip_keeps] + end + def sqlite3? !options[:skip_active_record] && options[:database] == 'sqlite3' end @@ -355,7 +359,7 @@ module Rails end def keep_file(destination) - create_file("#{destination}/.keep") unless options[:skip_keeps] + create_file("#{destination}/.keep") if keeps? end end end diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index 7c6f2098b8..e4a00ad181 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore +++ b/railties/lib/rails/generators/rails/app/templates/gitignore @@ -15,5 +15,7 @@ <% end -%> # Ignore all logfiles and tempfiles. /log/* +<% if keeps? -%> !/log/.keep +<% end -%> /tmp |