aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--doc/CHANGES.md3
-rwxr-xr-xscript/rails-post-deploy2
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index e1f12f68c..527bccb44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ TAGS
/files/
/public/download
/public/*theme
+/vendor/bundle
+.bundle \ No newline at end of file
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index f0eee4a81..51da903b1 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -6,6 +6,9 @@
## Upgrade notes
+* Existing installations will need to install the Bundler gem. See
+ `INSTALL.md` for details.
+
* Because dependencies are now handled by Bundler, when you next run
the `rails-post-deploy` script, it will download, compile and
install various things. Part of this is compiling xapian, which may
diff --git a/script/rails-post-deploy b/script/rails-post-deploy
index 2bf098c5d..6e2c88d28 100755
--- a/script/rails-post-deploy
+++ b/script/rails-post-deploy
@@ -76,7 +76,7 @@ fi
if [ "$OPTION_STAGING_SITE" = "0" ]
then
- bundle install --deployment
+ bundle install --without development:test --deployment
else
bundle install
fi