aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Rescue from Holidays::UnknownRegionErrorhotfix/0.21.0.24Gareth Rees2015-04-29-4/+15
| | | | | If you run an Alaveteli in a region where we can’t show holiday suggestions the holiday import page breaks. This commit rescues from an unavailable region so that we display a friendly error message.
* Remove confusing before blockGareth Rees2015-04-29-4/+11
| | | | | | Next commit adds a new spec; this before block was affecting the behaviour of the new spec. https://robots.thoughtbot.com/lets-not
* Merge branch 'hotfix/0.21.0.23'0.21.0.23Gareth Rees2015-04-27-24/+32
|\
| * Bump alaveteli versionhotfix/0.21.0.23Gareth Rees2015-04-27-1/+1
| |
| * Tidy InfoRequest#initial_request_textGareth Rees2015-04-27-5/+2
| |
| * Only load the outgoing messages that will be usedGareth Rees2015-04-27-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents loading of all outgoing messages related to the info request. Before OutgoingMessage Load (1.5ms) SELECT "outgoing_messages".* FROM "outgoing_messages" WHERE "outgoing_messages"."info_request_id" = 137 ORDER BY created_at After OutgoingMessage Load (0.8ms) SELECT "outgoing_messages".* FROM "outgoing_messages" WHERE "outgoing_messages"."info_request_id" = 137 ORDER BY created_at LIMIT 1
| * Improve performance initializing OutgoingMessageGareth Rees2015-04-27-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces the amount of queries to associated objects by directly checking the database before setting the default body content. Before > info_request.outgoing_messages OutgoingMessage Load (0.4ms) SELECT "outgoing_messages".* FROM "outgoing_messages" WHERE "outgoing_messages"."info_request_id" = 137 ORDER BY created_at InfoRequest Load (0.5ms) SELECT "info_requests".* FROM "info_requests" WHERE "info_requests"."id" = 137 LIMIT 1 PublicBody Load (0.5ms) SELECT "public_bodies".* FROM "public_bodies" WHERE "public_bodies"."id" = 16 LIMIT 1 HasTagString::HasTagStringTag Load (0.4ms) SELECT "has_tag_string_tags".* FROM "has_tag_string_tags" WHERE "has_tag_string_tags"."model_id" = 16 AND (model = 'PublicBody') CensorRule Load (0.4ms) SELECT "censor_rules".* FROM "censor_rules" WHERE "censor_rules"."info_request_id" IS NULL AND "censor_rules"."public_body_id" IS NULL AND "censor_rules"."user_id" IS NULL User Load (0.4ms) SELECT "users".* FROM "users" WHERE "users"."id" = 13 LIMIT 1 (0.5ms) SELECT COUNT(*) FROM "censor_rules" WHERE "censor_rules"."user_id" = 13 CensorRule Load (0.5ms) SELECT "censor_rules".* FROM "censor_rules" WHERE "censor_rules"."info_request_id" = 137 ORDER BY created_at desc CensorRule Load (0.5ms) SELECT "censor_rules".* FROM "censor_rules" WHERE "censor_rules"."public_body_id" = 16 ORDER BY created_at desc InfoRequest Load (0.5ms) SELECT "info_requests".* FROM "info_requests" WHERE "info_requests"."id" = 137 LIMIT 1 PublicBody Load (0.5ms) SELECT "public_bodies".* FROM "public_bodies" WHERE "public_bodies"."id" = 16 LIMIT 1 HasTagString::HasTagStringTag Load (0.6ms) SELECT "has_tag_string_tags".* FROM "has_tag_string_tags" WHERE "has_tag_string_tags"."model_id" = 16 AND (model = 'PublicBody') CensorRule Load (0.5ms) SELECT "censor_rules".* FROM "censor_rules" WHERE "censor_rules"."info_request_id" IS NULL AND "censor_rules"."public_body_id" IS NULL AND "censor_rules"."user_id" IS NULL User Load (0.6ms) SELECT "users".* FROM "users" WHERE "users"."id" = 13 LIMIT 1 (0.5ms) SELECT COUNT(*) FROM "censor_rules" WHERE "censor_rules"."user_id" = 13 CensorRule Load (0.4ms) SELECT "censor_rules".* FROM "censor_rules" WHERE "censor_rules"."info_request_id" = 137 ORDER BY created_at desc CensorRule Load (0.5ms) SELECT "censor_rules".* FROM "censor_rules" WHERE "censor_rules"."public_body_id" = 16 ORDER BY created_at desc => [#<OutgoingMessage id: 36, info_request_id: 137, body: "Some information please", status: "sent", message_type: "initial_request", created_at: "2015-04-17 10:50:21", updated_at: "2015-04-17 10:50:21", last_sent_at: "2015-04-17 10:50:21", incoming_message_followup_id: nil, what_doing: "normal_sort", prominence: "normal", prominence_reason: nil>, #<OutgoingMessage id: 37, info_request_id: 137, body: "Dear Example Public Body 6,\r\n\r\nc'mooooooonnnnnn\r\n\r\n...", status: "sent", message_type: "followup", created_at: "2015-04-20 12:18:30", updated_at: "2015-04-20 12:18:30", last_sent_at: "2015-04-20 12:18:30", incoming_message_followup_id: 30, what_doing: "normal_sort", prominence: "normal", prominence_reason: nil>] After > info_request.outgoing_messages OutgoingMessage Load (0.8ms) SELECT "outgoing_messages".* FROM "outgoing_messages" WHERE "outgoing_messages"."info_request_id" = 137 ORDER BY created_at => [#<OutgoingMessage id: 36, info_request_id: 137, body: "Some information please", status: "sent", message_type: "initial_request", created_at: "2015-04-17 10:50:21", updated_at: "2015-04-17 10:50:21", last_sent_at: "2015-04-17 10:50:21", incoming_message_followup_id: nil, what_doing: "normal_sort", prominence: "normal", prominence_reason: nil>, #<OutgoingMessage id: 37, info_request_id: 137, body: "Dear Example Public Body 6,\r\n\r\nc'mooooooonnnnnn\r\n\r\n...", status: "sent", message_type: "followup", created_at: "2015-04-20 12:18:30", updated_at: "2015-04-20 12:18:30", last_sent_at: "2015-04-20 12:18:30", incoming_message_followup_id: 30, what_doing: "normal_sort", prominence: "normal", prominence_reason: nil>]
| * Reduce N+1 queries in RequestGameController#playGareth Rees2015-04-27-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminates the following Bullet warnings: 2015-04-21 11:42:26[WARN] /categorise/play N+1 Query detected user: vagrant InfoRequest => [:public_body] Add to your finder: :includes => [:public_body] N+1 Query method call stack /home/vagrant/alaveteli/app/views/request/_request_listing_single.html.erb:16:in `_app_views_request__request_listing_single_html_erb__949797960_70091194573720' /home/vagrant/alaveteli/app/views/request_game/play.html.erb:46:in `_app_views_request_game_play_html_erb___279307748_70091194720080' /home/vagrant/alaveteli/app/views/request_game/play.html.erb:45:in `each' /home/vagrant/alaveteli/app/views/request_game/play.html.erb:45:in `_app_views_request_game_play_html_erb___279307748_70091194720080' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call' 2015-04-21 11:42:26[WARN] /categorise/play N+1 Query detected user: vagrant InfoRequest => [:user] Add to your finder: :includes => [:user] N+1 Query method call stack /home/vagrant/alaveteli/app/views/request/_request_listing_single.html.erb:17:in `_app_views_request__request_listing_single_html_erb__949797960_70091194573720' /home/vagrant/alaveteli/app/views/request_game/play.html.erb:46:in `_app_views_request_game_play_html_erb___279307748_70091194720080' /home/vagrant/alaveteli/app/views/request_game/play.html.erb:45:in `each' /home/vagrant/alaveteli/app/views/request_game/play.html.erb:45:in `_app_views_request_game_play_html_erb___279307748_70091194720080' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call'
| * Minor tidy upGareth Rees2015-04-27-16/+26
|/
* Merge branch 'hotfix/0.21.0.22'0.21.0.22Gareth Rees2015-04-24-4/+4
|\
| * Bump alaveteli versionhotfix/0.21.0.22Gareth Rees2015-04-24-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-24-3/+3
|/
* Bump alaveteli version0.21.0.21hotfix/0.21.0.21Louise Crow2015-04-23-1/+1
|
* Don't redirect to signin on expiration of a non remember-me sessionLouise Crow2015-04-23-2/+0
| | | | In practice, it's just confusing if you've been away from the site.
* Merge branch 'hotfix/0.21.0.20'0.21.0.20Gareth Rees2015-04-17-13/+11
|\
| * Bump alaveteli versionhotfix/0.21.0.20Gareth Rees2015-04-17-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-17-12/+10
|/
* Merge branch 'hotfix/0.21.0.19'0.21.0.19Gareth Rees2015-04-16-4/+4
|\
| * Bump alaveteli versionhotfix/0.21.0.19Gareth Rees2015-04-16-1/+1
| |
| * Update nicaragua translationsGareth Rees2015-04-16-3/+3
|/
* Merge branch 'hotfix/0.21.0.18'0.21.0.18Gareth Rees2015-04-16-3/+3
|\
| * Bump alaveteli versionhotfix/0.21.0.18Gareth Rees2015-04-16-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-16-2/+2
|/
* Merge branch 'hotfix/0.21.0.17'0.21.0.17Gareth Rees2015-04-16-5/+5
|\
| * Bump alaveteli versionhotfix/0.21.0.17Gareth Rees2015-04-16-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-16-4/+4
|/
* Merge branch 'hotfix/0.21.0.16'0.21.0.16Gareth Rees2015-04-15-26/+23
|\
| * Bump alaveteli versionhotfix/0.21.0.16Gareth Rees2015-04-15-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-15-25/+22
|/
* Merge branch 'hotfix/0.21.0.15'0.21.0.15Gareth Rees2015-04-10-30/+30
|\
| * Bump alaveteli versionhotfix/0.21.0.15Gareth Rees2015-04-10-1/+1
| |
| * Update nicaragua translationsGareth Rees2015-04-10-29/+29
|/
* Bump alaveteli version.0.21.0.14hotfix/0.21.0.14Louise Crow2015-04-10-1/+1
|
* Only use CSRF protection for logged-in users.Louise Crow2015-04-10-1/+12
|
* Add warning about updating search forms to release notes.Louise Crow2015-04-10-0/+4
|
* Use GET for search forms, not POST.Louise Crow2015-04-10-11/+32
| | | | | | | | | | Now that we use global CSRF authenticity checks, searches were logging logged-in users out as the form is an HTML form, not a Rails-generated form with a CSRF token. So form submission raised an InvalidAuthenticityToken error and reset their session. We could generate the form in Rails, but we also want to minimise the number of non-logged in people who have a session cookie, so that varnish can cache pages extensively. So we don't want to put the CSRF token for the search form in everyone's session.
* Merge branch 'hotfix/0.21.0.13'0.21.0.13Gareth Rees2015-04-09-6/+6
|\
| * Bump alaveteli versionhotfix/0.21.0.13Gareth Rees2015-04-09-1/+1
| |
| * Update nicaragua translationsGareth Rees2015-04-09-5/+5
|/
* Merge branch 'hotfix/0.21.0.12'0.21.0.12Gareth Rees2015-04-09-13/+13
|\
| * Bump alaveteli versionhotfix/0.21.0.12Gareth Rees2015-04-09-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-09-12/+12
|/
* Merge branch 'hotfix/0.21.0.11'0.21.0.11Gareth Rees2015-04-08-14/+14
|\
| * Bump alaveteli versionhotfix/0.21.0.11Gareth Rees2015-04-08-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-08-13/+13
|/
* Merge branch 'hotfix/0.21.0.10'0.21.0.10Gareth Rees2015-04-08-6/+5
|\
| * Bump alaveteli versionhotfix/0.21.0.10Gareth Rees2015-04-08-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-08-4/+4
| |
| * Whitespace update of Croatian translationGareth Rees2015-04-08-1/+0
|/
* Merge branch 'hotfix/0.21.0.9'0.21.0.9Gareth Rees2015-04-08-5/+5
|\