aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Add fix for Apple Mail with attachments Gareth Rees2014-11-04-2/+13825
|
* Add some specs to MailBackendGareth Rees2014-11-04-0/+145
|
* Merge branch 'hotfix/0.19.0.9' into rails-3-developLouise Crow2014-10-31-478/+4347
|\
| * Comment out spec which sends an invalid utf-8 param.0.19.0.9hotfix/0.19.0.9Louise Crow2014-10-31-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original error `ActionView::Template::Error` that this spec was written to represent (#1406) occurred under ruby 1.8 when the decoded non-utf-8 string was used in the locale switcher on the 'not found' error page to generate a url for the alternative locales. Under Ruby >= 1.9, the error thrown in that situation is an `invalid byte sequence in UTF-8` error, thrown in the same place - the locale switcher. However, no error seems to be thrown when the same param is used in a request in production. The upgrade to Rails 3.2.20 causes `String.split` to be called on the request path in `actionpack/lib/action_dispatch/middleware/static.rb` in order to check for attempts to access files outside the `public` directory. This means that under Ruby >= 1.9, an `invalid byte sequence in UTF-8` error will be thrown there in running this spec. I think a possible solution is to use the `rack-utf8_sanitizer` gem to provide middleware to strip invalid utf-8 from request URIs and headers before they're processed by Rails, but it's currently unclear whether that would have any undesirable side-effects.
| * Upgrade to Rails 3.2.20 - fixes CVE-2014-7818Louise Crow2014-10-31-26/+26
| | | | | | | | Arbitrary file existence disclosure in Action Pack
| * Results of running 'bundle update rails'Louise Crow2014-10-31-3/+3
| |
| * Latest translations from Transifex0.19.0.8hotfix/0.19.0.8Louise Crow2014-10-27-12/+3876
| |
| * Latest translations from transifex.0.19.0.7hotfix/0.19.0.7Louise Crow2014-10-24-433/+435
| |
| * Merge branch 'hotfix/0.19.0.6'0.19.0.6Gareth Rees2014-09-24-1/+2
| |\
* | \ Merge branch '875-remove-charities' into rails-3-developGareth Rees2014-10-30-10/+0
|\ \ \
| * | | Remove WDTK-specific charity linksGareth Rees2014-10-29-10/+0
| | | | | | | | | | | | These will be moved to whatdotheyknow-theme
* | | | Merge branch 'issues/1457-close-change-request-without-email' into ↵Louise Crow2014-10-30-27/+38
|\ \ \ \ | |/ / / |/| | | | | | | rails-3-develop
| * | | Remove redirect to trailing slash URL.Louise Crow2014-10-30-13/+1
| | | | | | | | | | | | | | | | | | | | Introduced in 4f501309ade230f65f4ba45e1d0161e89587d755 but no longer needed as we don't proxy the admin interface.
| * | | Allow closure of a change request without sending an email.Louise Crow2014-10-30-14/+37
| |/ /
* | | Merge branch 'code_tidying' into rails-3-developGareth Rees2014-10-29-564/+716
|\ \ \
| * | | Remove extra newlinesGareth Rees2014-10-29-3/+0
| | | |
| * | | Group PublicBody callbacks and macros at topGareth Rees2014-10-29-18/+21
| | | |
| * | | Extract descriptions in to TrackThing::TRACK_TYPESGareth Rees2014-10-29-20/+9
| | | | | | | | | | | | | | | | | | | | Makes TrackThing.track_type_description easier to understand and easier to add new track types along with a description.
| * | | Use where syntax for TrackThing.find_existingGareth Rees2014-10-29-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Faster (0.2ms vs 9.3ms) Shorter line length Non-deprecated syntax
| * | | Refactor TrackType types and mediums to constantsGareth Rees2014-10-29-12/+11
| | | |
| * | | Dynamically call params hash for TrackThing#paramsGareth Rees2014-10-29-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Easier to add params now; just add TRACK_TYPE_params method which returns the hash you want. Uses more idiomatic ||= instead of if @params.nil?
| * | | Extract hashes in TrackThing#params to methodsGareth Rees2014-10-29-113/+134
| | | | | | | | | | | | | | | | | | | | Use private methods to make TrackThing#params easier to read and ready for dynamic method calling based on the track_type
| * | | Clean TrackThingGareth Rees2014-10-29-51/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use inline if Remove explicit return Use string interpolation Use unless instead of if ! Remove self. Use . instead of :: for class method calls
| * | | Use self. for TrackThing class methodsGareth Rees2014-10-29-8/+8
| | | |
| * | | Group TrackThing class methods at top of fileGareth Rees2014-10-29-35/+37
| | | |
| * | | Group TrackThing macro methodsGareth Rees2014-10-29-6/+3
| | | |
| * | | Extract UserInfoRequestSentAlert alert typesGareth Rees2014-10-29-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract UserInfoRequestSentAlert alert types to ALERT_TYPES constant. Useful for tests and forms (access with UserInfoRequestSentAlert::ALERT_TYPES) and gives more meaning to what the array contains
| * | | Clean UserGareth Rees2014-10-29-80/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove self. Use unless instead of if ! Use . instead of :: for class methods Remove explicit return Use each instead of for Use inline if
| * | | Group User class methods at top of classGareth Rees2014-10-29-105/+104
| | | | | | | | | | | | | | | | https://github.com/bbatsov/ruby-style-guide#consistent-classes
| * | | Group User macro methods at top of fileGareth Rees2014-10-29-12/+8
| | | | | | | | | | | | | | | | https://github.com/bbatsov/rails-style-guide#macro-style-methods
| * | | Move User callbacks to top of fileGareth Rees2014-10-29-2/+3
| | | | | | | | | | | | | | | | | | | | Really difficult to figure out what’s going on when a callback is buried halfway between a load of methods
| * | | Extract RawEmail inline calls to private methodsGareth Rees2014-10-29-3/+8
| | | | | | | | | | | | | | | | One less thing for #directory and #filepath to do
| * | | Tidy RawEmailGareth Rees2014-10-29-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove self. Use inline block Use inline unless Use unless instead of if !
| * | | Tidy PurgeRequestGareth Rees2014-10-29-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove explicit return Remove unneeded parentheses Remove self. Remove extra newlines
| * | | Tidy ProfilePhotoGareth Rees2014-10-29-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | Remove self. Use inline if Line length
| * | | Extract after_initialize methods in PostRedirectGareth Rees2014-10-29-11/+10
| | | | | | | | | | | | | | | | Use separate methods to explicitly state what’s happening
| * | | Tidy PostRedirectGareth Rees2014-10-29-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line length Remove self. Use inline if Remove explicit return use unless instead of if !
| * | | Move PostRedirect class methods to top of fileGareth Rees2014-10-29-20/+22
| | | |
| * | | Tidy HolidayGareth Rees2014-10-29-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Use self. for class methods Remove self. Line length
| * | | Tidy ContactValidatorGareth Rees2014-10-29-1/+3
| | | | | | | | | | | | | | | | | | | | Line Length Remove self.
| * | | Move Comment class method to top of fileGareth Rees2014-10-29-15/+15
| | | |
| * | | Improve Comment.find_existingGareth Rees2014-10-29-4/+7
| | | | | | | | | | | | | | | | | | | | Use `.where` Extract complex sql to named variable for readability and line length
| * | | Use more meaningful validations in CommentGareth Rees2014-10-29-3/+9
| | | | | | | | | | | | | | | | Use validation method names that describe what the validation does
| * | | Tidy CommentGareth Rees2014-10-29-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove self. Use each rather than for Use {} block rather than do/end Use self. rather than ClassName. for class method Indent private as much as method definitions Remove explicit return Line Length Use inline if Move callback before method definitions Use unless instead of if !
| * | | Extract complexity in ChangeEmailValidatorGareth Rees2014-10-29-2/+10
| | | | | | | | | | | | | | | | Add some private methods to add more semantics to conditionals
| * | | Remove duplication in ChangeEmailValidatorGareth Rees2014-10-29-5/+8
| | | |
| * | | Tidy ChangeEmailValidatorGareth Rees2014-10-29-9/+19
| | | | | | | | | | | | | | | | | | | | Line Length Remove self.
| * | | Add ChangeEmailValidator specGareth Rees2014-10-29-0/+124
| | | |
| * | | Clean up AboutMeValidatorGareth Rees2014-10-20-1/+1
| | | | | | | | | | | | | | | | Remove self.
* | | | Merge branch 'body-show-sidebar-partial' into rails-3-developGareth Rees2014-10-28-21/+28
|\ \ \ \