aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-18 15:20:25 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-18 15:20:25 -0200
commit0ad6d27643057f2eccfe8351409a75a6d1bbb9d0 (patch)
tree56d60e24549b93f58b3c7d0d330a2474218b56e8
parent28fccad2c4ca8159b1c827026cdd09de9c5a3669 (diff)
downloadrails-0ad6d27643057f2eccfe8351409a75a6d1bbb9d0.tar.gz
rails-0ad6d27643057f2eccfe8351409a75a6d1bbb9d0.tar.bz2
rails-0ad6d27643057f2eccfe8351409a75a6d1bbb9d0.zip
Revert "Merge pull request #18951 from jurezove/gemfile-lock-to-plugin-gitignore-template"
This reverts commit b824dfd44bf2dd932d6d955ac868af1020f0099a, reversing changes made to 265dcb779dd4bfd9745e0131f585749d7034c3c7. Our general recommendation is to check in the lock file in the repository. This make possible to developers and contributors of a plugin always run their tests against a working set of dependencies. Also, bisect is a lot easier, specially if you have git dependencies in your Gemfile.
-rw-r--r--railties/lib/rails/generators/rails/plugin/templates/gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/templates/gitignore b/railties/lib/rails/generators/rails/plugin/templates/gitignore
index 547c9c7d89..d524fcbc4e 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/gitignore
+++ b/railties/lib/rails/generators/rails/plugin/templates/gitignore
@@ -1,7 +1,6 @@
.bundle/
log/*.log
pkg/
-Gemfile.lock
<% unless options[:skip_test] && options[:dummy_path] == 'test/dummy' -%>
<%= dummy_path %>/db/*.sqlite3
<%= dummy_path %>/db/*.sqlite3-journal