Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 17 insertions, 0 deletions

diff --git a/config/ci/travis/README b/config/ci/travis/README
new file mode 100644
index 0000000..58e37b2
--- /dev/null
+++ b/config/ci/travis/README
@@ -0,0 +1,17 @@
+These files are used for Travis tests to test admin and user permissions:
+
+couchdb.yml.admin:
+
+  when activated, leap_web has admin permissions (e.g. ability to create
+  databases, upload design docs).
+
+couchdb.yml.user:
+
+  when activited, leap_web has normal permissions (e.g. can modify all the
+  records).
+
+The term 'user' here is misleading. It is really two different types of admin
+permissions.
+
+Rails or rake must be run with 'test' environment for these configs to be
+used.