aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove jquery and jquery-ui.Louise Crow2015-06-17-397/+0
| | | | These should be provided by jquery-ui-rails.
* Update jquery-rails to get the fix for CVE-2015-1840.Louise Crow2015-06-17-3/+3
|
* Update comment - no longer using external uudecodeLouise Crow2015-06-12-1/+1
|
* Merge branch 'updating-derived-atts' into developLouise Crow2015-06-12-33/+84
|\
| * Move updating of derived attributes to a concern.Louise Crow2015-06-12-33/+84
| | | | | | | | | | | | Add spec to demonstrate that admin-added bodies aren't getting derived attributes. Add a spec to demonstrate the problem setting the first letter for translations. Demonstrate failure to update derived attributes in translations.
* | Merge remote-tracking branch 'jpmckinney_github/scripts' into developLouise Crow2015-06-12-10/+2
|\ \
| * | Eliminate TODO in shell scriptsJames McKinney2015-06-11-10/+2
| | |
* | | Merge branch 'sanitize-utf8' into developLouise Crow2015-06-11-0/+35
|\ \ \ | |_|/ |/| |
| * | Use rack-utf8_sanitizer to handle badly-formed UTF-8 in request URI and headers.Louise Crow2015-06-11-0/+35
|/ /
* | Merge branch 'format-admin-form-from-address' into developLouise Crow2015-06-08-1/+19
|\ \
| * | Use address_from_name_and_email to correctly format from field.Louise Crow2015-06-08-1/+19
| | | | | | | | | | | | | | | | | | | | | Prior to this, a name with commas in it plus email address would have been treated as several separate addresses, some of which would have just consisted of the bits of the name between the commas, and would have been invalid.
* | | Merge branch 'develop' of ssh://git.mysociety.org/data/git/public/alaveteli ↵Louise Crow2015-06-04-135/+3050
|\ \ \ | | | | | | | | | | | | into develop
| * \ \ Merge branch '2288-public-body-page-performance' into developGareth Rees2015-06-04-123/+130
| |\ \ \
| | * | | Avoid loading associations to check existenceGareth Rees2015-06-04-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling InfoRequestEvent#is_X? loads the associated model from the database. We don't need to do this to check what 'type' the event is. This commit first checks whether there is an association_id – if there is then we know it's that 'type'. If there's no association_id, call the association to check whether one has been added but not yet persisted. Only check association if the object is a new record. This avoids checking the association on a persisted record when we know it isn't that type of event due to the database record not existing.
| | * | | Only use and/or for control flowGareth Rees2015-06-04-1/+1
| | | | |
| | * | | Directly return the associated IncomingMessageGareth Rees2015-06-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | InfoRequestEvent#incoming_message_selective_columns ends up returning the same thing.
| | * | | Simplify InfoRequestEvent#is_incoming_message?Gareth Rees2015-06-04-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just check if there's an associated InfoRequest. user system total real old 0.010000 0.000000 0.010000 ( 0.012269) new 0.000000 0.000000 0.000000 ( 0.000101)
| | * | | Pass existing track to _tracking_linksGareth Rees2015-06-04-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing track is already found in PublicBodyController#show. Really, the partial shouldn't attempt to find one in the fallback case, but keeping for now for compatibility.
| | * | | Fix indentationGareth Rees2015-06-04-18/+16
| | | | |
| | * | | Fix alignmentGareth Rees2015-06-04-15/+15
| | | | |
| | * | | Remove unused codeGareth Rees2015-06-04-13/+1
| | | | |
| | * | | Idiomatic rubyGareth Rees2015-06-04-4/+3
| | | | |
| | * | | Indentation tidyGareth Rees2015-06-04-10/+11
| | | | |
| | * | | Use ARel syntaxGareth Rees2015-06-04-1/+1
| | | | |
| | * | | Extract logic in view to controllerGareth Rees2015-06-04-3/+4
| | | | |
| | * | | Minor tidy upGareth Rees2015-06-04-20/+22
| | | | |
| | * | | No longer need to compact typesGareth Rees2015-06-04-2/+0
| | | | |
| | * | | Use each_with_index rather than state variableGareth Rees2015-06-04-5/+2
| | | | |
| | * | | Speed up PublicBodyHelper#type_of_authorityGareth Rees2015-06-04-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously loaded all PublicBodyHeading and associated PublicBodyCategory records. Now only loads the PublicBodyCategory records that relate to the PublicBody. user system total real old 0.320000 0.000000 0.320000 ( 0.356155) new 0.010000 0.000000 0.010000 ( 0.010077)
| | * | | Fix typoGareth Rees2015-06-04-1/+1
| | | | | | | | | | | | | | | | | | | | Types should be CamelCase
| | * | | Use SQL to find first resultGareth Rees2015-06-04-4/+4
| | | | | | | | | | | | | | | | | | | | No point loading all results if we're only ever going to return the first.
| | * | | Use string interpolationGareth Rees2015-06-04-1/+1
| | | | |
| | * | | Use Hash#fetch for nil fallbackGareth Rees2015-06-04-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Easier to understand Removes explicit return
| | * | | Use database query to return unique resultsGareth Rees2015-06-04-5/+6
| | | | | | | | | | | | | | | | | | | | Use pluck to return only public_body_id instead of filtering in Ruby
| | * | | Remove explicit returnGareth Rees2015-05-29-1/+1
| | | | |
| | * | | Use arel queryGareth Rees2015-05-29-4/+5
| | | | |
| | * | | Remove unused variableGareth Rees2015-05-29-2/+1
| | | | |
| | * | | Minor tidyGareth Rees2015-05-29-1/+15
| | | | |
| * | | | Merge branch 'hotfix/0.21.0.36' into developGareth Rees2015-06-04-12/+2920
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Bump alaveteli versionhotfix/0.21.0.36Gareth Rees2015-06-04-1/+1
| | | | |
| | * | | Correctly set uuencoded attachment file size2508-hotfix-bad-uudecodeGareth Rees2015-06-04-2/+2
| | | | |
| | * | | Use Ruby to decode uuencoded attachmentsGareth Rees2015-06-03-6/+2881
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby can natively decode uuencoded text with String#unpack. [1] This avoids the uuencode program dependency and avoids writing tempfiles. The actual implementation is taken from mail [2]. The UnixToUnix module is not available in our bundled version of mail. This commit includes a spec to illustrate the failure of uuencode(1) to decode the particular attachment in incoming-request-bad-uuencoding-2. email. Parsing with uuencode returns the following error: External Command: Error from command "uudecode -o /dev/stdout /tmp/foiuu20150530-14811-u6j936": uudecode: /tmp/foiuu20150530-14811-u6j936: No `end' line The file _is_ created and appears to be OK, but the exit code is 1. This causes AlaveteliExternalCommand to fail and return nil. See #2508 [3] for the bug report. [1] http://ruby-doc.org/core-1.8.7/String.html#method-i-unpack [2] https://github.com/mikel/mail/blob/bc4c9bb9321e9d36a678692f2f562d3146b63f78/lib/mail/encodings/unix_to_unix.rb#L7 [3] https://github.com/mysociety/alaveteli/issues/2508
| | * | | Clean IncomingMessage#_uudecode_and_save_attachmentsGareth Rees2015-06-03-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | each instead of for remove self avoid explicit return
| | * | | Add spec for simple uuencoded attachmentGareth Rees2015-06-03-0/+33
| | | | | | | | | | | | | | | Inspired by https://github.com/mikel/mail/commit/bc4c9bb9321e9d36a678692f2f562d3146b63f78
* | | | | Merge branch '2507_untranslatable_string' into developLouise Crow2015-06-04-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Untranslatable string "Internal review of"gorm2015-06-04-1/+1
|/ / / / | | | | | | | | | | | | Fixes #2507
* | | | Merge branch 'move-to-develop' into developLouise Crow2015-05-29-5/+5
|\ \ \ \
| * | | | Update references to rails-3-develop to point at developLouise Crow2015-05-29-5/+5
| | |/ / | |/| |
* | | | Merge branch 'hotfix/0.21.0.35' into rails-3-developrails-3-developLouise Crow2015-05-29-8/+27
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Bump Alaveteli version0.21.0.35hotfix/0.21.0.35Louise Crow2015-05-29-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 02:36:58 +0000