aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2015-02-15 17:57:26 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2015-02-15 17:57:26 -0500
commitb824dfd44bf2dd932d6d955ac868af1020f0099a (patch)
tree2dfab92b20b10432c9c1ca4e914cbd464b3df404 /railties
parent265dcb779dd4bfd9745e0131f585749d7034c3c7 (diff)
parent2b1ea14456e5d10ef312327914aa8f07b1cdbbb4 (diff)
downloadrails-b824dfd44bf2dd932d6d955ac868af1020f0099a.tar.gz
rails-b824dfd44bf2dd932d6d955ac868af1020f0099a.tar.bz2
rails-b824dfd44bf2dd932d6d955ac868af1020f0099a.zip
Merge pull request #18951 from jurezove/gemfile-lock-to-plugin-gitignore-template
Add Gemfile.lock to plugin's gitignore template
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/plugin/templates/gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/templates/gitignore b/railties/lib/rails/generators/rails/plugin/templates/gitignore
index d524fcbc4e..547c9c7d89 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/gitignore
+++ b/railties/lib/rails/generators/rails/plugin/templates/gitignore
@@ -1,6 +1,7 @@
.bundle/
log/*.log
pkg/
+Gemfile.lock
<% unless options[:skip_test] && options[:dummy_path] == 'test/dummy' -%>
<%= dummy_path %>/db/*.sqlite3
<%= dummy_path %>/db/*.sqlite3-journal