diff options
| author | Dmitrii Golub <dmitrii.golub@gmail.com> | 2014-03-22 03:26:02 +0400 |
|---|---|---|
| committer | Dmitrii Golub <dmitrii.golub@gmail.com> | 2014-03-24 14:53:38 +0400 |
| commit | f42c7eee7e63d9ac4426259f6b1b424b3f759faa (patch) | |
| tree | 107a6fd340aed9b40e37a2ebc056085a1307b01c /railties/lib/rails | |
| parent | 2ca3f338adfcf2fdc3ac43d7f4fe226e854a318d (diff) | |
| download | rails-f42c7eee7e63d9ac4426259f6b1b424b3f759faa.tar.gz rails-f42c7eee7e63d9ac4426259f6b1b424b3f759faa.tar.bz2 rails-f42c7eee7e63d9ac4426259f6b1b424b3f759faa.zip | |
Remove sqlite3 lines from .gitignore if the application is not using sqlite3.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 2 |
3 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 fbdc47ea44..dd1438800c 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -172,6 +172,10 @@ module Rails options[value] ? '# ' : '' end + def sqlite3? + !options[:skip_active_record] && options[:database] == 'sqlite3' + end + class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out) def initialize(name, version, comment, options = {}, commented_out = false) super diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 83cb1dc0d5..abf6909a7f 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -50,7 +50,7 @@ module Rails end def gitignore - copy_file "gitignore", ".gitignore" + template "gitignore", ".gitignore" end def app diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index 6a502e997f..8775e5e235 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore +++ b/railties/lib/rails/generators/rails/app/templates/gitignore @@ -7,10 +7,12 @@ # Ignore bundler config. /.bundle +<% if sqlite3? -%> # Ignore the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal +<% end -%> # Ignore all logfiles and tempfiles. /log/*.log /tmp |