aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'switch-xml-mini-backend' into developLouise Crow2015-06-19-0/+2
|\
| * Switch xml backend to nokogiri to avoiC CVE-2015-3227.Louise Crow2015-06-19-0/+2
| |
* | Merge branch 'upgrade-rack' into developLouise Crow2015-06-19-3/+3
|\ \
| * | Upgrade rack to get the fix for CVE-2015-3225.Louise Crow2015-06-17-3/+3
| |/
* | Merge branch 'tidy_public_body' into developGareth Rees2015-06-17-167/+261
|\ \
| * | Add some TODOsGareth Rees2015-06-15-2/+11
| | |
| * | Use alias_method to define duplicate methodGareth Rees2015-06-15-4/+2
| | |
| * | Group similar methodsGareth Rees2015-06-15-18/+19
| | |
| * | Privatise PublicBody#reindex_requested_fromGareth Rees2015-06-15-13/+19
| | | | | | | | | | | | Only used in a callback
| * | Code tidyGareth Rees2015-06-15-40/+44
| | |
| * | Add markers for deprecated and privatised methodsGareth Rees2015-06-15-0/+6
| | | | | | | | | | | | Just to aid current cleanup
| * | Prevent PublicBody#set_api_key call if unrequiredGareth Rees2015-06-15-3/+43
| | | | | | | | | | | | | | | Don't call the method unless we need to. Adds #set_api_key! to set a new API key even if there's an existing one.
| * | Privatise PublicBody#set_default_publication_schemeGareth Rees2015-06-15-6/+15
| | | | | | | | | | | | Only used in a callback
| * | Deprecate PublicBody.set_first_letterGareth Rees2015-06-15-13/+14
| | | | | | | | | | | | Unused since 1524f83baa3b93a506dbefe7def0c4c304f93745
| * | Deprecate PublicBody#calculate_cached_fieldsGareth Rees2015-06-15-8/+10
| | | | | | | | | | | | | | | Not used anywhere. Moved it to the bottom of the file out of the way.
| * | Explicitly define each callbackGareth Rees2015-06-15-2/+2
| | | | | | | | | | | | | | | Just not worth using an Array. Prevents easily adding conditionals and reordering.
| * | Tidy alignmentsGareth Rees2015-06-15-7/+9
| | |
| * | Group macros and move inner classes to top of fileGareth Rees2015-06-15-66/+82
| | | | | | | | | | | | https://github.com/bbatsov/ruby-style-guide#consistent-classes
* | | Merge branch 'hotfix/0.21.0.38' into developGareth Rees2015-06-17-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: config/initializers/alaveteli.rb
| * | | Bump alaveteli versionGareth Rees2015-06-17-1/+1
| | | | | | | | | | | | | | | | Forgot to bump it in 0.37
| * | | Bump alaveteli versionGareth Rees2015-06-17-1/+1
| | | |
| * | | Merge branch 'hotfix/0.21.0.37'0.21.0.37Gareth Rees2015-06-15-1974/+1946
| |\ \ \
* | | | | Bump alaveteli versionGareth Rees2015-06-17-1/+1
| | | | |
* | | | | Clean fuzzy translationsGareth Rees2015-06-16-40/+0
| | | | |
* | | | | Generate translationsGareth Rees2015-06-15-366/+4127
| | | | |
* | | | | Merge branch 'hotfix/0.21.0.37' into developGareth Rees2015-06-15-1974/+1946
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update translationshotfix/0.21.0.37Gareth Rees2015-06-15-1974/+1946
| |/ / /
| * | | Merge branch 'hotfix/0.21.0.36'0.21.0.36Gareth Rees2015-06-04-12/+2920
| |\ \ \
* | | | | Update newrelic gemGareth Rees2015-06-15-1/+1
| |_|/ / |/| | |
* | | | Remove sharutils packageGareth Rees2015-06-15-5/+1
| |_|/ |/| | | | | | | | Not needed since 1e8dc7d5cbb382f6cb94716fd1ff0c990d219792.
* | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-27 14:37:00 +0000