Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'initial_request_text-2' into rails-3-develop | Gareth Rees | 2015-05-12 | -41/+166 |
|\ | ||||
| * | InfoRequest#initial_request_text performance | Gareth Rees | 2015-05-12 | -3/+9 |
| | | | | | | | | | | | | | | | | Passes the InfoRequest's CensorRules directly to the OutgoingMessage. user system total real old 0.010000 0.010000 0.020000 ( 0.020827) new 0.010000 0.000000 0.010000 ( 0.016633) | |||
| * | 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 | -9/+37 |
| | | | | | | | | | | | | | | 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/+41 |
| | | | | | | | | | | | | 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. | |||
| * | Use #raw_body sugar method | Gareth Rees | 2015-05-12 | -1/+1 |
| | | ||||
| * | Extract text cleaning from #body method | Gareth Rees | 2015-05-12 | -9/+10 |
| | | ||||
| * | Improve OutgoingMessage#body specs | Gareth Rees | 2015-05-12 | -21/+70 |
| | | ||||
| * | InfoRequest#initial_request_text minor improvement | Gareth Rees | 2015-05-12 | -2/+1 |
| | | | | | | | | | | | | system total real old 0.810000 0.300000 1.110000 ( 1.358172) new 0.970000 0.090000 1.060000 ( 1.292340) | |||
* | | Remove debug line | Louise Crow | 2015-05-12 | -1/+0 |
|/ | ||||
* | Merge remote-tracking branch 'petter_github/debian-wheezy-font-pkg' into ↵ | Louise Crow | 2015-05-12 | -0/+1 |
|\ | | | | | | | rails-3-develop | |||
| * | Add the ttf-bitstream-vera package to provide Vera.ttf to the cron jobs. | Petter Reinholdtsen | 2015-05-09 | -0/+1 |
| | | ||||
* | | Merge branch 'html-relative-path' into rails-3-develop | Louise Crow | 2015-05-12 | -3/+3 |
|\ \ | ||||
| * | | Bump alaveteli version0.21.0.27hotfix/0.21.0.27 | Louise Crow | 2015-05-12 | -1/+1 |
| | | | ||||
| * | | Use a relative path in call to pdftohtml. | Louise Crow | 2015-05-11 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | pdftohtml will use the file path as the basis for generating the image links in the generated HTML, so we want them to be relative, not absolute. Ruby 1.9 tempfile.path will generate an absolute path when given the current directory as the tmpdir, whilst 2.0 and 1.8 will use a relative one. | |||
| * | | Merge branch 'hotfix/0.21.0.26'0.21.0.26 | Gareth Rees | 2015-05-06 | -4/+4 |
| |\ \ | ||||
* | \ \ | Merge branch 'send-mailimport-errors-to-exception-notification' into ↵ | Louise Crow | 2015-05-12 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | rails-3-develop | |||
| * | | | Send mail import errors to exception notification address. | Louise Crow | 2015-05-11 | -3/+3 |
|/ / / | | | | | | | | | | | | | Usually these are going to require some technical action. There's not much regular admins can do about them. | |||
* | | | Merge branch 'update_secure_headers' into rails-3-develop | Gareth Rees | 2015-05-08 | -3/+3 |
|\ \ \ | ||||
| * | | | Update secure_headers | Gareth Rees | 2015-05-05 | -3/+3 |
| | | | | ||||
* | | | | Merge branch 'remove-obsolete-code' into rails-3-develop | Louise Crow | 2015-05-07 | -9/+0 |
|\ \ \ \ | ||||
| * | | | | Remove monkeypatch required when running Rails 2.3 under Ruby 1.9 | Louise Crow | 2015-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-develop | Louise Crow | 2015-05-07 | -4/+29 |
|\ \ \ \ | ||||
| * | | | | Force the encoding of values returned from YAML. | Louise Crow | 2015-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 Crow | 2015-05-05 | -1/+2 |
| |/ / / | | | | | | | | | | | | | Items cached in 1.8 can't safely be retrieved in 1.9 | |||
* | | | | Merge branch 'add_bullet' into rails-3-develop | Gareth Rees | 2015-05-07 | -1/+24 |
|\ \ \ \ | ||||
| * | | | | Add bullet | Gareth Rees | 2015-05-07 | -1/+24 |
|/ / / / | | | | | | | | | | | | | Help to kill N+1 queries and unused eager loading | |||
* | | | | Merge branch 'initialize-info-request' into rails-3-develop | Gareth Rees | 2015-05-07 | -26/+152 |
|\ \ \ \ | ||||
| * | | | | Minor tidy up | Gareth Rees | 2015-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 InfoRequest | Gareth Rees | 2015-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 controller | Gareth Rees | 2015-05-07 | -13/+6 |
| | | | | | ||||
| * | | | | Add InfoRequest#move_to_public_body | Gareth Rees | 2015-05-07 | -0/+116 |
|/ / / / | ||||
* | | | | Merge branch 'hotfix/0.21.0.26' into rails-3-develop | Gareth Rees | 2015-05-06 | -4/+4 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | ||||
| * | | Bump alavetli version | Gareth Rees | 2015-05-06 | -1/+1 |
| | | | ||||
| * | | Update Nicaragua translattions | Gareth Rees | 2015-05-06 | -3/+3 |
| |/ | ||||
* | | 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. |