diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-24 09:22:11 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-24 09:22:11 -0300 |
| commit | 9d8354c9d3858844294a9d963e32e66591e34e25 (patch) | |
| tree | dafd696b4220d93dfeac6a94e88d11662f4f5813 /railties/lib | |
| parent | 8bd29122ec4e8f7e3e42ee4fe3a5b203780c3fe1 (diff) | |
| parent | f42c7eee7e63d9ac4426259f6b1b424b3f759faa (diff) | |
| download | rails-9d8354c9d3858844294a9d963e32e66591e34e25.tar.gz rails-9d8354c9d3858844294a9d963e32e66591e34e25.tar.bz2 rails-9d8354c9d3858844294a9d963e32e66591e34e25.zip | |
Merge pull request #14447 from Houdini/gitignore
Skip sqlite3 files in .gitignore if no sqlite3 in app
Diffstat (limited to 'railties/lib')
| -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 |