Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'initial_request_text-2' into rails-3-develop | Gareth Rees | 2015-05-12 | -23/+127 |
|\ | ||||
| * | Use a sequence for InfoRequest factory | Gareth Rees | 2015-05-12 | -2/+3 |
| | | | | | | | | Avoids unique name constraint | |||
| * | Allow optional censor rules to be passed to #body | Gareth Rees | 2015-05-12 | -4/+22 |
| | | | | | | | | | | | | | | If we’re in the context of an InfoRequest and want the OutgoingMessage#body, we can pass the rules in explicitly to avoid looking up the info request again. Otherwise it falls back to the existing behaviour. | |||
| * | Add a non-mutating #apply_to_text | Gareth Rees | 2015-05-12 | -0/+36 |
| | | | | | | | | | | | | Still need to `return nil if text_to_censor.nil?` because `gsub!` returns `nil` rather than the original text if it does not make a substitution. | |||
| * | Improve OutgoingMessage#body specs | Gareth Rees | 2015-05-12 | -21/+70 |
| | | ||||
* | | Remove debug line | Louise Crow | 2015-05-12 | -1/+0 |
|/ | ||||
* | Merge branch 'version-dependent-caching' into rails-3-develop | Louise Crow | 2015-05-07 | -1/+15 |
|\ | ||||
| * | Force the encoding of values returned from YAML. | Louise Crow | 2015-05-07 | -1/+15 |
| | | | | | | | | | | | | | | | | | | 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/. | |||
* | | Don't load PublicBody when initalizing InfoRequest | Gareth Rees | 2015-05-07 | -2/+21 |
| | | | | | | | | | | 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 | |||
* | | Add InfoRequest#move_to_public_body | Gareth Rees | 2015-05-07 | -0/+92 |
|/ | ||||
* | Merge branch 'hotfix/0.21.0.24' into rails-3-develop | Gareth Rees | 2015-04-30 | -4/+18 |
|\ | ||||
| * | Rescue from Holidays::UnknownRegionErrorhotfix/0.21.0.24 | Gareth Rees | 2015-04-29 | -0/+7 |
| | | | | | | | | | | 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 'add-widget' into rails-3-develop | Louise Crow | 2015-04-28 | -1/+269 |
|\ \ | ||||
| * | | Use factory for widget vote | Louise Crow | 2015-04-28 | -1/+8 |
| | | | ||||
| * | | Use status value from controller. | Louise Crow | 2015-04-28 | -21/+18 |
| | | | ||||
| * | | Use a helper to generate the status text. | Louise Crow | 2015-04-28 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||
| * | | Don't show the widget pages for requests without normal prominence. | Louise Crow | 2015-04-28 | -0/+32 |
| | | | ||||
| * | | Validate the uniqueness of cookies within the scope of info requests. | Louise Crow | 2015-04-27 | -0/+16 |
| | | | ||||
| * | | Don't set 'same origin' policy for widget iframes. | Louise Crow | 2015-04-27 | -0/+5 |
| | | | | | | | | | | | | | | | Whilst this is a good security precaution in general, we want people to display these widgets in iframes on other sites. | |||
| * | | Allow widgets to be controlled with a feature flag. | Louise Crow | 2015-04-27 | -0/+33 |
| | | | ||||
| * | | Use resource-based RESTful routing and separate controller | Louise Crow | 2015-04-27 | -107/+111 |
| | | | ||||
| * | | Add some specs for the vote tracking action. | Louise Crow | 2015-04-27 | -0/+46 |
| | | | ||||
| * | | Add some specs for widget vote validation. | Louise Crow | 2015-04-27 | -0/+37 |
| | | | ||||
| * | | Add some controller specs for widget actions. | Louise Crow | 2015-04-27 | -0/+60 |
| | | | ||||
* | | | Add a note about tidying up the spec file | Henare Degan | 2015-04-27 | -0/+2 |
| | | | ||||
* | | | Don't put HTML entities in comment on alert plural email subject lines | Henare Degan | 2015-04-27 | -0/+7 |
| | | | ||||
* | | | Don't put HTML entities in comment on alert email subject lines | Henare Degan | 2015-04-27 | -0/+7 |
| | | | ||||
* | | | Don't put HTML entities in not clarified alert email subject lines | Henare Degan | 2015-04-27 | -0/+7 |
| | | | ||||
* | | | Don't put HTML entities in very overdue alert email subject lines | Henare Degan | 2015-04-27 | -0/+7 |
| | | | ||||
* | | | Don't put HTML entities in overdue alert email subject lines | Henare Degan | 2015-04-27 | -0/+7 |
| | | | ||||
* | | | Don't put HTML entities in requires admin email subject lines | Henare Degan | 2015-04-27 | -1/+4 |
| | | | ||||
* | | | Don't put HTML entities in new response email subject lines | Henare Degan | 2015-04-27 | -0/+4 |
| | | | ||||
* | | | Merge branch 'hotfix/0.21.0.21' into rails-3-develop | Louise Crow | 2015-04-23 | -1/+0 |
|\ \ \ | | |/ | |/| | ||||
| * | | Don't redirect to signin on expiration of a non remember-me session | Louise Crow | 2015-04-23 | -1/+0 |
| | | | | | | | | | | | | In practice, it's just confusing if you've been away from the site. | |||
* | | | Make sure raw emails exist - the tests assume they do | Louise Crow | 2015-04-23 | -0/+1 |
| |/ |/| | ||||
* | | Merge remote-tracking branch ↵ | Louise Crow | 2015-04-23 | -0/+11 |
|\ \ | | | | | | | | | | 'nzherald_github/fix-xapian-macron-highlighting' into rails-3-develop | |||
| * | | Fix encoding issue with searching for macrons | Caleb | 2015-04-20 | -0/+11 |
| | | | | | | | | | | | | Correct indentation to be consistent | |||
* | | | Change PublicBody behaviour to not override blank request emails | Henare Degan | 2015-04-21 | -2/+2 |
| | | | | | | | | | | | | | | | This is so if you're overriding the request email you can still observe how Alaveteli behaves when there's no request email set. | |||
* | | | Remove unnecessary method | Henare Degan | 2015-04-21 | -1/+0 |
| | | | ||||
* | | | Describe current PublicBody#request_email behaviour in tests | Henare Degan | 2015-04-21 | -0/+27 |
|/ / | ||||
* | | Fixed status check helper | Caleb | 2015-04-20 | -0/+5 |
| | | ||||
* | | We have no expectation of order here. | Louise Crow | 2015-04-16 | -1/+1 |
| | | | | | | | | Fixes transient failure like https://travis-ci.org/mysociety/alaveteli/jobs/58761975 | |||
* | | Merge branch 'fix-text-masker-logger-call' into rails-3-develop | Louise Crow | 2015-04-16 | -0/+17 |
|\ \ | ||||
| * | | Refactor a bit to allow testing of logic branches. | Louise Crow | 2015-04-16 | -0/+17 |
| | | | | | | | | | | | | | | | Add specs for current behaviour on failure to uncompress, failure to compress. | |||
* | | | Merge branch 'issues/556-info_request_destroy' into rails-3-develop | Louise Crow | 2015-04-16 | -0/+16 |
|\ \ \ | |/ / |/| | | ||||
| * | | Destroy associated censor rules and comments. | Louise Crow | 2015-04-13 | -0/+16 |
| |/ | ||||
* | | Merge branch 'fix-xapian-spec-failures' into rails-3-develop | Louise Crow | 2015-04-13 | -7/+4 |
|\ \ | ||||
| * | | Make sure xapian index is initialized before specs run. | Louise Crow | 2015-04-13 | -0/+4 |
| | | | ||||
| * | | Remove duplicate method. | Louise Crow | 2015-04-13 | -7/+0 |
| |/ | | | | | | | Also defined in spec/support/xapian_index.rb |