aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeLines
* Merge branch 'hotfix/0.21.0.35' into rails-3-developrails-3-developLouise Crow2015-05-29-1/+1
|\
| * Bump Alaveteli version0.21.0.35hotfix/0.21.0.35Louise Crow2015-05-29-1/+1
| |
* | Merge branch 'hotfix/0.21.0.34' into rails-3-developLouise Crow2015-05-28-1/+1
|\|
| * Bump alaveteli version0.21.0.34hotfix/0.21.0.34Louise Crow2015-05-28-1/+1
| |
* | Merge branch 'hotfix/0.21.0.33' into rails-3-developLouise Crow2015-05-28-1/+1
|\|
| * Bump alaveteli version0.21.0.33hotfix/0.21.0.33Louise Crow2015-05-28-1/+1
| |
* | Merge branch 'hotfix/0.21.0.32' into rails-3-developLouise Crow2015-05-26-1/+1
|\|
| * Bump alaveteli version0.21.0.32hotfix/0.21.0.32Louise Crow2015-05-26-1/+1
| |
| * Bump Alaveteli version0.21.0.31Louise Crow2015-05-15-1/+1
| |
* | Add a AdminColumn concernJames McKinney2015-05-20-0/+1
| |
* | Merge branch 'set-file-encodings' into rails-3-developLouise Crow2015-05-15-1/+24
|\ \
| * | Add source file encoding for all ruby files.Louise Crow2015-05-15-1/+24
| | | | | | | | | | | | | | | | | | This is important under ruby 1.9 in order to determine the encoding that will be used for new strings created in the code in the file.
* | | Merge branch 'hotfix/0.21.0.30' into rails-3-developLouise Crow2015-05-15-1/+1
|\ \ \ | | |/ | |/|
| * | Bump alaveteli version0.21.0.30hotfix/0.21.0.30Louise Crow2015-05-15-1/+1
| | |
* | | Merge branch 'hotfix/0.21.0.29' into rails-3-developGareth Rees2015-05-13-1/+1
|\| |
| * | Bump alaveteli versionGareth Rees2015-05-13-1/+1
| | |
* | | Merge branch 'hotfix/0.21.0.28' into rails-3-developGareth Rees2015-05-13-1/+1
|\| | | |/ |/|
| * Bump alaveteli versionhotfix/0.21.0.28Gareth Rees2015-05-13-1/+1
| |
* | Merge remote-tracking branch 'petter_github/debian-wheezy-font-pkg' into ↵Louise Crow2015-05-12-0/+1
|\ \ | | | | | | | | | rails-3-develop
| * | Add the ttf-bitstream-vera package to provide Vera.ttf to the cron jobs.Petter Reinholdtsen2015-05-09-0/+1
| | |
* | | Merge branch 'html-relative-path' into rails-3-developLouise Crow2015-05-12-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump alaveteli version0.21.0.27hotfix/0.21.0.27Louise Crow2015-05-12-1/+1
| |
* | Merge branch 'remove-obsolete-code' into rails-3-developLouise Crow2015-05-07-1/+0
|\ \
| * | Remove monkeypatch required when running Rails 2.3 under Ruby 1.9Louise Crow2015-05-07-1/+0
| | | | | | | | | | | | | | | | | | This was added because TMail calls String#is_binary_data? which does not exist in Ruby 1.9.2 onwards. We don't use TMail anymore so this is no longer needed.
* | | Merge branch 'version-dependent-caching' into rails-3-developLouise Crow2015-05-07-1/+2
|\ \ \
| * | | Make the namespace for memcached dependent on ruby version.Louise Crow2015-05-05-1/+2
| |/ / | | | | | | | | | Items cached in 1.8 can't safely be retrieved in 1.9
* | | Add bulletGareth Rees2015-05-07-0/+16
| | | | | | | | | | | | Help to kill N+1 queries and unused eager loading
* | | Merge branch 'hotfix/0.21.0.26' into rails-3-developGareth Rees2015-05-06-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump alavetli versionGareth Rees2015-05-06-1/+1
| |
* | root no longer required for loading mail logsLouise Crow2015-04-30-3/+1
| |
* | Merge branch 'rails-3-develop' of ↵Louise Crow2015-04-30-1/+1
|\ \ | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | Merge branch 'master' into rails-3-developGareth Rees2015-04-30-1/+1
| |\|
| | * Bump alaveteli version0.21.0.25Gareth Rees2015-04-30-1/+1
| | | | | | | | | | | | | | | Bumping to .25 because I forgot before I merged hotfix 0.21.0.24; treating this as a new hotfix.
* | | Merge branch 'easy-ruby-version' into rails-3-developLouise Crow2015-04-30-0/+0
|\ \ \ | |/ / |/| |
| * | Use .example files for daemons.Louise Crow2015-04-28-0/+0
| | | | | | | | | | | | | | | Consistent with other example config files, and helps us solve a mySociety config issue.
* | | Symlink the theme directory on Capistrano deploysHenare Degan2015-04-28-0/+2
| | | | | | | | | | | | | | | | | | This effectively caches themes for faster and smaller deploys. After the first deploy the themes will only need a Git update and all deploys will share a common Git repositories for the themes.
* | | Delete .cvsignoreGareth Rees2015-04-28-3/+0
|/ /
* | Merge branch 'fix-alert-daemon-restart' into rails-3-developLouise Crow2015-04-28-2/+2
|\ \
| * | Use a retry option when stopping daemons.Louise Crow2015-04-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checks whether the process has actually stopped before continuing. A value of 5 specifies that processes will be given 5 seconds to terminate after the first TERM signal has been issued, then another 5 seconds after a KILL command before the function will return an error. http://manpages.ubuntu.com/manpages/trusty/man8/start-stop-daemon.8.html
* | | Merge branch 'add-widget' into rails-3-developLouise Crow2015-04-28-0/+11
|\ \ \ | |/ / |/| |
| * | Allow widgets to be controlled with a feature flag.Louise Crow2015-04-27-0/+8
| | |
| * | Use resource-based RESTful routing and separate controllerLouise Crow2015-04-27-2/+1
| | |
| * | Add controller for non-logged in "voting"Jody McIntyre2015-04-27-0/+1
| | |
| * | Add widget for info requestsJody McIntyre2015-04-23-0/+3
| | |
* | | Merge branch 'hotfix/0.21.0.23' into rails-3-developGareth Rees2015-04-27-1/+1
|\ \ \ | | |/ | |/|
| * | Bump alaveteli versionhotfix/0.21.0.23Gareth Rees2015-04-27-1/+1
| | |
* | | Merge branch 'hotfix/0.21.0.22' into rails-3-developGareth Rees2015-04-24-1/+1
|\| |
| * | Bump alaveteli versionhotfix/0.21.0.22Gareth Rees2015-04-24-1/+1
| | |
* | | Merge branch 'hotfix/0.21.0.21' into rails-3-developLouise Crow2015-04-23-1/+1
|\| | | |/ |/|
| * Bump alaveteli version0.21.0.21hotfix/0.21.0.21Louise Crow2015-04-23-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-11 16:12:07 +0000