aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeLines
* Merge branch 'hotfix/0.21.0.33' into rails-3-developLouise Crow2015-05-28-3/+21
|\
| * Merge branch 'handle-unparsed-email-as-binary' into hotfix/0.21.0.33Louise Crow2015-05-28-3/+21
| |\
| | * Handle unparsed email contents as binary.Louise Crow2015-05-26-3/+21
| * | Make sure regexes used in highlight helper are UTF-8 encodedLouise Crow2015-05-28-0/+1
| |/
| * Use mb_chars to prevent slicing multibyte chars under ruby 1.8Louise Crow2015-05-15-1/+1
* | Merge remote-tracking branch 'jpmckinney/truefalse' into rails-3-developGareth Rees2015-05-28-14/+13
|\ \
| * | Eliminate !! (bang bang)James McKinney2015-05-27-1/+1
| * | Avoid unnecessary ternary operationsJames McKinney2015-05-21-13/+13
| * | AdminUserController: remove unused instance variable and avoid unneeded ternaryJames McKinney2015-05-21-2/+1
* | | Merge remote-tracking branch 'jpmckinney_github/extract_method4' into rails-3...Louise Crow2015-05-26-18/+14
|\ \ \
| * | | MailServerLog: Extract duplicate code into new methodJames McKinney2015-05-21-18/+14
| |/ /
* | | Merge branch 'scope-comments' into rails-3-developLouise Crow2015-05-26-5/+11
|\ \ \
| * | | Restore methods with deprecation noticesLouise Crow2015-05-26-0/+12
| * | | Replace visible_comments method with a scope on the Comment modelHenare Degan2015-05-22-7/+5
| * | | Remove unused methodHenare Degan2015-05-22-4/+0
* | | | Merge remote-tracking branch 'jpmckinney_github/class_methods' into rails-3-d...Louise Crow2015-05-26-45/+45
|\ \ \ \
| * | | | Declare class methods the idiomatic Ruby wayJames McKinney2015-05-21-45/+45
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'openaustralia_github/286-public-body-show-visib...Louise Crow2015-05-26-6/+8
|\ \ \ \
| * | | | Only include visible requests in count on body pageHenare Degan2015-05-22-6/+8
| | |/ / | |/| |
* | | | Make a 'Your email:' string translatable.Petter Reinholdtsen2015-05-23-1/+1
* | | | Merge remote-tracking branch 'jpmckinney_github/extract_method5' into rails-3...Louise Crow2015-05-22-50/+35
|\ \ \ \
| * | | | RequestMailer: change #mail_user_with_info_request_title argument order to re...James McKinney2015-05-22-6/+6
| * | | | RequestMailer: Extract common `mail` callJames McKinney2015-05-21-21/+19
| * | | | RequestMailer: Extract common headersJames McKinney2015-05-21-30/+17
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'jpmckinney_github/unused_method' into rails-3-d...Louise Crow2015-05-22-13/+0
|\ \ \ \
| * | | | InfoRequest: Remove unused methodJames McKinney2015-05-21-13/+0
| |/ / /
* | | | Merge remote-tracking branch 'jpmckinney_github/extract_method' into rails-3-...Louise Crow2015-05-22-15/+11
|\ \ \ \
| * | | | InfoRequest#add_conditions_from_extra_params should be class methodJames McKinney2015-05-22-1/+1
| * | | | Extract a method to add conditions from extra_params in InfoRequestJames McKinney2015-05-20-15/+11
* | | | | Merge remote-tracking branch 'jpmckinney_github/parentheses' into rails-3-dev...Louise Crow2015-05-22-62/+70
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove all optional parentheses for method calls in RubyJames McKinney2015-05-21-62/+70
| | |/ / | |/| |
* / | | FoiAttachment: Use simpler Array#include? instead of Hash#[]James McKinney2015-05-21-19/+15
|/ / /
* | | Merge branch 'translatable' into rails-3-developLouise Crow2015-05-21-107/+48
|\ \ \
| * | | Include the new Translatable concernJames McKinney2015-05-20-0/+6
| * | | Move common public body translation behavior into an ActiveSupport::ConcernJames McKinney2015-05-20-108/+43
| |/ /
* | | Merge branch 'about-me-built-in-validation' into rails-3-developLouise Crow2015-05-21-10/+1
|\ \ \
| * | | Support old hash syntaxLouise Crow2015-05-21-1/+1
| * | | Use built in validation on AboutMeValidator modelHenare Degan2015-05-20-10/+1
| |/ /
* | | Merge remote-tracking branch 'openaustralia_github/remove-unused-comment-mode...Louise Crow2015-05-21-4/+0
|\ \ \
| * | | Remove unused method in comment modelHenare Degan2015-05-20-4/+0
| |/ /
* / / Add a AdminColumn concernJames McKinney2015-05-20-46/+29
|/ /
* | Merge branch 'set-file-encodings' into rails-3-developLouise Crow2015-05-15-8/+86
|\ \
| * | Add source file encoding for all ruby files.Louise Crow2015-05-15-8/+87
* | | Merge branch 'multibyte-safe-slice' into rails-3-developLouise Crow2015-05-15-1/+1
|\ \ \
| * | | Use mb_chars to prevent slicing multibyte chars under ruby 1.8Louise Crow2015-05-12-1/+1
* | | | Merge branch 'hotfix/0.21.0.30' into rails-3-developLouise Crow2015-05-15-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/alaveteli in...Louise Crow2015-05-15-3/+11
| |\ \ \
| * | | | Add UTF-8 encoding line.hotfix/0.29.0.30Louise Crow2015-05-15-0/+1
| | |/ / | |/| |
* | | | Merge branch 'hotfix/0.21.0.28' into rails-3-developGareth Rees2015-05-13-3/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Discard rejected responses with malformed From:Gareth Rees2015-05-13-1/+6