diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-29 14:36:11 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-29 14:36:11 +0100 |
| commit | 742684d8093c062ca57d0d8d05e141d5557c8bc0 (patch) | |
| tree | 5e2f84dd156e7c3b1b8fd88d9c29d81e4a802ddd | |
| parent | b7a40c15d8c69a02edfc68e2681b3f68228ce8f0 (diff) | |
Update references to rails-3-develop to point at develop
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | doc/CHANGES.md | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 3351bed2a..c795edc67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: ruby branches: only: - master - - rails-3-develop + - develop rvm: - 1.8.7-p374 - 1.9.3 @@ -1,6 +1,6 @@ # Welcome to Alaveteli! -[](http://travis-ci.org/mysociety/alaveteli) [](https://gemnasium.com/mysociety/alaveteli) [](https://coveralls.io/r/mysociety/alaveteli) [](https://codeclimate.com/github/mysociety/alaveteli) +[](http://travis-ci.org/mysociety/alaveteli) [](https://gemnasium.com/mysociety/alaveteli) [](https://coveralls.io/r/mysociety/alaveteli) [](https://codeclimate.com/github/mysociety/alaveteli) [](http://mysociety.github.io/installation-standards.html) This is an open source project to create a standard, internationalised @@ -52,10 +52,10 @@ If you find what looks like a bug: If you want to contribute an enhancement or a fix: * Fork the project on GitHub. -* Make a topic branch from the rails-3-develop branch. +* Make a topic branch from the develop branch. * Make your changes with tests. * Commit the changes without making changes to any files that aren't related to your enhancement or fix. -* Send a pull request against the rails-3-develop branch. +* Send a pull request against the develop branch. Looking for the latest stable release? It's on the [master branch](https://github.com/mysociety/alaveteli/tree/master). diff --git a/doc/CHANGES.md b/doc/CHANGES.md index f4f75ce2b..ebb3f10a7 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -480,7 +480,7 @@ Example: `rm public/download` * This release upgrades the assumed version of Ubuntu from lucid (10.04) to precise (12.04) * This release upgrades rubygems in config/packages - version 1.8.15 is available from squeeze-backports on Debian or by default in Ubuntu precise. This upgrade may result in "invalid date format in specification:" errors - these should be fixable by manually deleting the gems specs that are being referenced in the error and re-running rails-post-deploy -* If you would like to have a public body statistics page (this will be publicly available), set the `PUBLIC_BODY_STATISTICS_PAGE` param in general.yml to `true`. You should also add a new cron job based on the one in config/crontab-example `https://github.com/mysociety/alaveteli/blob/rails-3-develop/config/crontab-example#L29` to update the public body stats each day. +* If you would like to have a public body statistics page (this will be publicly available), set the `PUBLIC_BODY_STATISTICS_PAGE` param in general.yml to `true`. You should also add a new cron job based on the one in config/crontab-example `https://github.com/mysociety/alaveteli/blob/develop/config/crontab-example#L29` to update the public body stats each day. * If you would like the public body list page to include bodies that have no translation in the current locale, but do have a translation in the default locale, add a `PUBLIC_BODY_LIST_FALLBACK_TO_DEFAULT_LOCALE` param set to `true` to your config/general.yml file. |