Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'mail-server-logs-as-app-user' into rails-3-develop | Louise Crow | 2015-04-30 | -3/+1 |
|\ | ||||
| * | root no longer required for loading mail logs | Louise Crow | 2015-04-30 | -3/+1 |
|/ | ||||
* | Merge branch 'add-alaveteli-user-to-adm' into rails-3-develop | Louise Crow | 2015-04-30 | -0/+3 |
|\ | ||||
| * | Add the site user to the 'adm' group. | Louise Crow | 2015-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-develop | Louise Crow | 2015-04-30 | -84/+91 |
|\ | ||||
| * | Refactor for idiomatic ruby. | Louise Crow | 2015-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 method | Louise Crow | 2015-04-29 | -26/+28 |
| | | ||||
| * | Factor out term initialisation into its own method. | Louise Crow | 2015-04-29 | -18/+20 |
| | | ||||
| * | Use each, identify variables for readability, break up long lines. | Louise Crow | 2015-04-29 | -13/+16 |
| | | ||||
| * | Use variable interpolation. | Louise Crow | 2015-04-29 | -1/+1 |
| | | ||||
| * | Extract running a job to its own method. | Louise Crow | 2015-04-29 | -24/+28 |
| | | ||||
| * | Cleanup spacing. | Louise Crow | 2015-04-29 | -1/+1 |
| | | ||||
| * | Use pluck - it's more efficient and concise. | Louise Crow | 2015-04-29 | -2/+1 |
| | | ||||
| * | Use empty?, it's more idiomatic | Louise Crow | 2015-04-29 | -1/+1 |
| | | ||||
| * | Use a pluck call to get the model names | Louise Crow | 2015-04-29 | -1/+1 |
| | | | | | | | | Clearer, and more efficient. | |||
| * | Use an each block | Louise Crow | 2015-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 block | Louise Crow | 2015-04-29 | -10/+7 |
| | | | | | | | | Exceptions are a slow way to do control flow, and this seems clearer. | |||
* | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2015-04-30 | -9/+27 |
|\ \ | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop | |||
| * \ | Merge branch 'master' into rails-3-develop | Gareth Rees | 2015-04-30 | -1/+1 |
| |\ \ | ||||
| | * | | Bump alaveteli version0.21.0.25 | Gareth Rees | 2015-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.24 | Gareth Rees | 2015-04-30 | -8/+26 |
| | |\ \ | ||||
| * | \ \ | Merge branch 'hotfix/0.21.0.24' into rails-3-develop | Gareth Rees | 2015-04-30 | -8/+26 |
| |\ \ \ \ | | | |/ / | | |/| | | ||||
| | * | | | Rescue from Holidays::UnknownRegionErrorhotfix/0.21.0.24 | Gareth Rees | 2015-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 block | Gareth Rees | 2015-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.23 | Gareth Rees | 2015-04-27 | -24/+32 |
| | |\ \ | ||||
* | | \ \ | Merge branch 'easy-ruby-version' into rails-3-develop | Louise Crow | 2015-04-30 | -7/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | Use .example files for daemons. | Louise Crow | 2015-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-develop | Gareth Rees | 2015-04-28 | -0/+8 |
|\ \ \ \ | ||||
| * | | | | Symlink the theme directory on Capistrano deploys | Henare Degan | 2015-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 .cvsignore | Gareth Rees | 2015-04-28 | -5/+0 |
| | | | | ||||
* | | | | Merge remote-tracking branch 'github/garethrees-patch-2' into rails-3-develop | Gareth Rees | 2015-04-28 | -3/+0 |
|\ \ \ \ | |/ / / |/| | | | ||||
| * | | | Delete .cvsignore | Gareth Rees | 2015-04-28 | -3/+0 |
|/ / / | ||||
* | | | Merge branch 'fix-alert-daemon-restart' into rails-3-develop | Louise Crow | 2015-04-28 | -2/+2 |
|\ \ \ | ||||
| * | | | Use a retry option when stopping daemons. | Louise Crow | 2015-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-develop | Louise Crow | 2015-04-28 | -3/+609 |
|\ \ \ \ | |/ / / |/| | | | ||||
| * | | | Use a boolean operator - 'and' and 'or' are for control flow. | Louise Crow | 2015-04-28 | -1/+1 |
| | | | | ||||
| * | | | Use || - 'and' and 'or' are for control flow, not logical operators | Louise Crow | 2015-04-28 | -1/+1 |
| | | | | ||||
| * | | | Use factory for widget vote | Louise Crow | 2015-04-28 | -1/+8 |
| | | | | ||||
| * | | | Move existing track logic to controller | Louise Crow | 2015-04-28 | -7/+6 |
| | | | | ||||
| * | | | Move vote calculation to controller. | Louise Crow | 2015-04-28 | -2/+2 |
| | | | | ||||
| * | | | Use status value from controller. | Louise Crow | 2015-04-28 | -25/+21 |
| | | | | ||||
| * | | | Clean up first_or_create call. | Louise Crow | 2015-04-28 | -1/+3 |
| | | | | ||||
| * | | | Add some notes on usage. | Louise Crow | 2015-04-28 | -0/+3 |
| | | | | ||||
| * | | | Use a helper to generate the status text. | Louise Crow | 2015-04-28 | -35/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has length constraints, so we don't want to directly use InfoRequest.get_status_description (which also adds a full stop), but we want statuses that more closely correspond to get_status_description than those in the template, which are used in AskTheEU. | |||
| * | | | Add height to stop long text overflowing. | Louise Crow | 2015-04-28 | -0/+1 |
| | | | | ||||
| * | | | Tweak widget size, add border. | Louise Crow | 2015-04-28 | -2/+3 |
| | | | | ||||
| * | | | Add closing tags for iframes. | Louise Crow | 2015-04-28 | -2/+2 |
| | | | | ||||
| * | | | Make scss, add custom hook. | Louise Crow | 2015-04-28 | -4/+1 |
| | | | | ||||
| * | | | Don't capitalize the label | Louise Crow | 2015-04-28 | -0/+1 |
| | | | | ||||
| * | | | Move styling out of translatable text as much as possible. | Louise Crow | 2015-04-28 | -6/+5 |
| | | | |