aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Improve speed of collecting bodies with no emailGareth Rees2015-05-07-1/+5
| | | | | | user system total real old 0.050000 0.020000 0.070000 ( 0.088856) new 0.020000 0.000000 0.020000 ( 0.018556)
* Merge branch 'remove-obsolete-code' into rails-3-developLouise Crow2015-05-07-9/+0
|\
| * Remove monkeypatch required when running Rails 2.3 under Ruby 1.9Louise Crow2015-05-07-9/+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-4/+29
|\ \
| * | Force the encoding of values returned from YAML.Louise Crow2015-05-07-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for an issue where YAML in ruby 1.8 tags UTF-8 heavy strings as binary, resulting in them being retrieved under 1.9 as ASCII-8BIT which can't be concatenated with UTF-8. Described as "Deep deep YAML oddness" in https://www.zendesk.com/blog/upgrade-the-road-to-1-9/.
| * | 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
* | Merge branch 'add_bullet' into rails-3-developGareth Rees2015-05-07-1/+24
|\ \
| * | Add bulletGareth Rees2015-05-07-1/+24
|/ / | | | | | | Help to kill N+1 queries and unused eager loading
* | Merge branch 'initialize-info-request' into rails-3-developGareth Rees2015-05-07-26/+152
|\ \
| * | Minor tidy upGareth Rees2015-05-07-11/+8
| | | | | | | | | | | | | | | | | | | | | Remove explicit returns Remove self Ternary for short conditional Moved #site_administration? to be nearer similar methods
| * | Don't load PublicBody when initalizing InfoRequestGareth Rees2015-05-07-3/+23
| | | | | | | | | | | | | | | Doesn't need to try to set the default law_used once it's persisted, so we save a query each time we find an InfoRequest
| * | Extract logic from controllerGareth Rees2015-05-07-13/+6
| | |
| * | Add InfoRequest#move_to_public_bodyGareth Rees2015-05-07-0/+116
|/ /
* | Merge branch 'hotfix/0.21.0.26' into rails-3-developGareth Rees2015-05-06-4/+4
|\ \ | |/ |/|
| * Bump alavetli versionGareth Rees2015-05-06-1/+1
| |
| * Update Nicaragua translattionsGareth Rees2015-05-06-3/+3
| |
* | Merge branch 'mail-server-logs-as-app-user' into rails-3-developLouise Crow2015-04-30-3/+1
|\ \
| * | root no longer required for loading mail logsLouise Crow2015-04-30-3/+1
|/ /
* | Merge branch 'add-alaveteli-user-to-adm' into rails-3-developLouise Crow2015-04-30-0/+3
|\ \
| * | Add the site user to the 'adm' group.Louise Crow2015-04-30-0/+3
|/ / | | | | | | | | This is so that they can access mail log files. adm group members have access to read log files in /var/log
* | Merge branch 'xapian-refactor' into rails-3-developLouise Crow2015-04-30-84/+91
|\ \
| * | Refactor for idiomatic ruby.Louise Crow2015-04-30-15/+18
| | | | | | | | | | | | | | | | | | Use of each rather than for, case statement for multi-clause if, variable interpolation rather than concatenation. Also use inline variables in the each for clarity.
| * | Factor out initialisation of values into its own methodLouise Crow2015-04-29-26/+28
| | |
| * | Factor out term initialisation into its own method.Louise Crow2015-04-29-18/+20
| | |
| * | Use each, identify variables for readability, break up long lines.Louise Crow2015-04-29-13/+16
| | |
| * | Use variable interpolation.Louise Crow2015-04-29-1/+1
| | |
| * | Extract running a job to its own method.Louise Crow2015-04-29-24/+28
| | |
| * | Cleanup spacing.Louise Crow2015-04-29-1/+1
| | |
| * | Use pluck - it's more efficient and concise.Louise Crow2015-04-29-2/+1
| | |
| * | Use empty?, it's more idiomaticLouise Crow2015-04-29-1/+1
| | |
| * | Use a pluck call to get the model namesLouise Crow2015-04-29-1/+1
| | | | | | | | | | | | Clearer, and more efficient.
| * | Use an each blockLouise Crow2015-04-29-4/+1
| | | | | | | | | | | | It's idiomatic, and you can assign the elements of the list inline.
| * | Use respond_to? rather than a begin rescue blockLouise Crow2015-04-29-10/+7
| | | | | | | | | | | | Exceptions are a slow way to do control flow, and this seems clearer.
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2015-04-30-9/+27
|\ \ \ | | | | | | | | | | | | 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 'hotfix/0.21.0.24'0.21.0.24Gareth Rees2015-04-30-8/+26
| | |\ \
| * | \ \ Merge branch 'hotfix/0.21.0.24' into rails-3-developGareth Rees2015-04-30-8/+26
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Rescue from Holidays::UnknownRegionErrorhotfix/0.21.0.24Gareth Rees2015-04-29-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | If you run an Alaveteli in a region where we can’t show holiday suggestions the holiday import page breaks. This commit rescues from an unavailable region so that we display a friendly error message.
| | * | | Remove confusing before blockGareth Rees2015-04-29-4/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | Next commit adds a new spec; this before block was affecting the behaviour of the new spec. https://robots.thoughtbot.com/lets-not
| | * | Merge branch 'hotfix/0.21.0.23'0.21.0.23Gareth Rees2015-04-27-24/+32
| | |\ \
* | | \ \ Merge branch 'easy-ruby-version' into rails-3-developLouise Crow2015-04-30-7/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use .example files for daemons.Louise Crow2015-04-28-7/+7
| | |_|/ | |/| | | | | | | | | | | | | | Consistent with other example config files, and helps us solve a mySociety config issue.
* | | | Merge branch 'openaustralia-capistrano-cache-themes' into rails-3-developGareth Rees2015-04-28-0/+8
|\ \ \ \
| * | | | Symlink the theme directory on Capistrano deploysHenare Degan2015-04-28-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | 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-5/+0
| | | |
* | | | Merge remote-tracking branch 'github/garethrees-patch-2' into rails-3-developGareth Rees2015-04-28-3/+0
|\ \ \ \ | |/ / / |/| | |
| * | | 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