aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeLines
* 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
| | | | | | | | | | | | | | | | | | Stops the RequestMailer trying to send a stopped_responses mail if the To: address can’t be parsed from the incoming message. ArgumentError: An SMTP To address is required to send a message. Set the message smtp_envelope_to, to, cc, or bcc address.
| * Add explaining commentsGareth Rees2015-05-13-0/+2
| |
| * Sensible error messageGareth Rees2015-05-13-1/+1
| |
| * Put emails with malformed To: field in holding penGareth Rees2015-05-13-1/+1
| | | | | | | | | | Prevents mailin exiting with an error code of 75 and sending error reports to the team@ email address.
| * Use each instead of forGareth Rees2015-05-13-1/+2
| | | | | | | | Extract email collection to explaining variable
* | Merge branch '2241-admin-summary-performance' into rails-3-developGareth Rees2015-05-13-50/+100
|\ \
| * | Remove summary stats from admin summary pageGareth Rees2015-05-12-23/+4
| | | | | | | | | | | | | | | | | | They're duplicated on /admin/summary and a bit slow [1]. [1] https://wiki.postgresql.org/wiki/Slow_Counting
| * | Use database attributes to find public_response_eventsGareth Rees2015-05-12-1/+8
| | | | | | | | | | | | | | | | | | user system total real old 1.070000 0.280000 1.350000 ( 1.657773) new 0.560000 0.120000 0.680000 ( 0.743485)
| * | Remove N+1 QueryGareth Rees2015-05-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the following bullet warning: N+1 Query detected PublicBody => [:translations] Add to your finder: :includes => [:translations] N+1 Query method call stack /home/vagrant/alaveteli/app/helpers/link_to_helper.rb:70:in `public_body_url' /home/vagrant/alaveteli/app/helpers/link_to_helper.rb:74:in `public_body_path' /home/vagrant/alaveteli/app/helpers/admin_helper.rb:28:in `public_body_both_links' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:148:in `_app_views_admin_general_index_html_erb__1495531968_70090875267640' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:145:in `each' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:145:in `_app_views_admin_general_index_html_erb__1495531968_70090875267640' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call'
| * | Use existing attributeGareth Rees2015-05-07-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `last_event_time` is set as a result of calling `InfoRequest.find_in_state`. This commit adds an explicit accessor that converts it to a `DateTime` and uses it in the view, preventing an extra query for each `InfoRequest` in the result set. Before: Completed 200 OK in 14908.9ms (Views: 14625.3ms | ActiveRecord: 69.8ms) After: Completed 200 OK in 2481.0ms (Views: 2437.1ms | ActiveRecord: 5.2ms)
| * | Reduce N+1 queries getting holding pen requestsGareth Rees2015-05-07-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the following bullet warning: N+1 Query detected IncomingMessage => [:raw_email] Add to your finder: :includes => [:raw_email] N+1 Query method call stack /home/vagrant/alaveteli/app/models/incoming_message.rb:115:in `parse_raw_email!' /home/vagrant/alaveteli/app/models/incoming_message.rb:150:in `sent_at' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:54:in `_app_views_admin_general_index_html_erb___48164640_70115534664600' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:42:in `_app_views_admin_general_index_html_erb___48164640_70115534664600' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call' Improved view rendering times: Before: Completed 200 OK in 2813.9ms (Views: 1697.3ms | ActiveRecord: 9.5ms) Completed 200 OK in 2548.6ms (Views: 1838.2ms | ActiveRecord: 8.2ms) After: Completed 200 OK in 2185.9ms (Views: 276.0ms | ActiveRecord: 7.5ms) Completed 200 OK in 2216.3ms (Views: 100.3ms | ActiveRecord: 7.6ms)
| * | Line length of holding pen messages sectionGareth Rees2015-05-07-3/+11
| | |
| * | Reduce N+1 queries getting update body requestsGareth Rees2015-05-07-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the following bullet warnings: N+1 Query detected PublicBodyChangeRequest => [:public_body] Add to your finder: :includes => [:public_body] N+1 Query method call stack /home/vagrant/alaveteli/app/models/public_body_change_request.rb:65:in `get_public_body_name' /home/vagrant/alaveteli/app/views/admin_general/_change_request_summary.html .erb:8:in `_app_views_admin_general__change_request_summary_html_erb__490351475_701155 42681500' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:225:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:224:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call' N+1 Query detected PublicBodyChangeRequest => [:user] Add to your finder: :includes => [:user] N+1 Query method call stack /home/vagrant/alaveteli/app/models/public_body_change_request.rb:57:in `get_user_name' /home/vagrant/alaveteli/app/views/admin_general/_change_request_summary.html .erb:46:in `_app_views_admin_general__change_request_summary_html_erb__490351475_701155 42681500' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:225:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:224:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call'
| * | Reduce N+1 queries getting new body requestsGareth Rees2015-05-07-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the following Bullet warnings: N+1 Query detected PublicBodyChangeRequest => [:public_body] Add to your finder: :includes => [:public_body] N+1 Query method call stack /home/vagrant/alaveteli/app/models/public_body_change_request.rb:65:in `get_public_body_name' /home/vagrant/alaveteli/app/views/admin_general/_change_request_summary.html .erb:8:in `_app_views_admin_general__change_request_summary_html_erb__490351475_701155 42681500' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:191:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:190:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call' N+1 Query detected PublicBodyChangeRequest => [:user] Add to your finder: :includes => [:user] N+1 Query method call stack /home/vagrant/alaveteli/app/models/public_body_change_request.rb:57:in `get_user_name' /home/vagrant/alaveteli/app/views/admin_general/_change_request_summary.html .erb:46:in `_app_views_admin_general__change_request_summary_html_erb__490351475_701155 42681500' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:191:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/views/admin_general/index.html.erb:190:in `_app_views_admin_general_index_html_erb___48164640_70115537288900' /home/vagrant/alaveteli/app/controllers/application_controller.rb:111:in `record_memory' /home/vagrant/alaveteli/lib/whatdotheyknow/strip_empty_sessions.rb:14:in `call'
| * | Line length of new bodies sectionGareth Rees2015-05-07-9/+24
| | |
| * | Line length of update authorities sectionGareth Rees2015-05-07-7/+24
| | |
| * | Improve speed of collecting bodies with no emailGareth Rees2015-05-07-1/+5
| | | | | | | | | | | | | | | | | | user system total real old 0.050000 0.020000 0.070000 ( 0.088856) new 0.020000 0.000000 0.020000 ( 0.018556)
* | | InfoRequest#initial_request_text performanceGareth Rees2015-05-12-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Passes the InfoRequest's CensorRules directly to the OutgoingMessage. user system total real old 0.010000 0.010000 0.020000 ( 0.020827) new 0.010000 0.000000 0.010000 ( 0.016633)
* | | Allow optional censor rules to be passed to #bodyGareth Rees2015-05-12-5/+15
| | | | | | | | | | | | | | | | | | | | | If we’re in the context of an InfoRequest and want the OutgoingMessage#body, we can pass the rules in explicitly to avoid looking up the info request again. Otherwise it falls back to the existing behaviour.
* | | Add a non-mutating #apply_to_textGareth Rees2015-05-12-0/+5
| | | | | | | | | | | | | | | | | | Still need to `return nil if text_to_censor.nil?` because `gsub!` returns `nil` rather than the original text if it does not make a substitution.
* | | Use #raw_body sugar methodGareth Rees2015-05-12-1/+1
| | |
* | | Extract text cleaning from #body methodGareth Rees2015-05-12-9/+10
| | |
* | | InfoRequest#initial_request_text minor improvementGareth Rees2015-05-12-2/+1
|/ / | | | | | | | | | | system total real old 0.810000 0.300000 1.110000 ( 1.358172) new 0.970000 0.090000 1.060000 ( 1.292340)
* | Merge branch 'version-dependent-caching' into rails-3-developLouise Crow2015-05-07-2/+12
|\ \
| * | Force the encoding of values returned from YAML.Louise Crow2015-05-07-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for an issue where YAML in ruby 1.8 tags UTF-8 heavy strings as binary, resulting in them being retrieved under 1.9 as ASCII-8BIT which can't be concatenated with UTF-8. Described as "Deep deep YAML oddness" in https://www.zendesk.com/blog/upgrade-the-road-to-1-9/.
* | | Minor tidy upGareth Rees2015-05-07-11/+8
| | | | | | | | | | | | | | | | | | | | | Remove explicit returns Remove self Ternary for short conditional Moved #site_administration? to be nearer similar methods
* | | Don't load PublicBody when initalizing InfoRequestGareth Rees2015-05-07-1/+2
| | | | | | | | | | | | | | | Doesn't need to try to set the default law_used once it's persisted, so we save a query each time we find an InfoRequest
* | | Extract logic from controllerGareth Rees2015-05-07-13/+6
| | |
* | | Add InfoRequest#move_to_public_bodyGareth Rees2015-05-07-0/+24
|/ /
* | Merge branch 'hotfix/0.21.0.24' into rails-3-developGareth Rees2015-04-30-4/+8
|\|
| * Rescue from Holidays::UnknownRegionErrorhotfix/0.21.0.24Gareth Rees2015-04-29-4/+8
| | | | | | | | | | 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.
* | Merge branch 'add-widget' into rails-3-developLouise Crow2015-04-28-2/+314
|\ \
| * | Use a boolean operator - 'and' and 'or' are for control flow.Louise Crow2015-04-28-1/+1
| | |
| * | Use || - 'and' and 'or' are for control flow, not logical operatorsLouise Crow2015-04-28-1/+1
| | |
| * | Move existing track logic to controllerLouise Crow2015-04-28-7/+6
| | |
| * | Move vote calculation to controller.Louise Crow2015-04-28-2/+2
| | |
| * | Use status value from controller.Louise Crow2015-04-28-4/+3
| | |
| * | Clean up first_or_create call.Louise Crow2015-04-28-1/+3
| | |
| * | Use a helper to generate the status text.Louise Crow2015-04-28-35/+48
| | | | | | | | | | | | | | | | | | | | | | | | This has length constraints, so we don't want to directly use InfoRequest.get_status_description (which also adds a full stop), but we want statuses that more closely correspond to get_status_description than those in the template, which are used in AskTheEU.
| * | Add height to stop long text overflowing.Louise Crow2015-04-28-0/+1
| | |
| * | Tweak widget size, add border.Louise Crow2015-04-28-2/+3
| | |
| * | Add closing tags for iframes.Louise Crow2015-04-28-2/+2
| | |
| * | Make scss, add custom hook.Louise Crow2015-04-28-4/+1
| | |
| * | Don't capitalize the labelLouise Crow2015-04-28-0/+1
| | |
| * | Move styling out of translatable text as much as possible.Louise Crow2015-04-28-6/+5
| | |
| * | Add a wrapperLouise Crow2015-04-28-12/+10
| | | | | | | | | | | | | | | We don't want to set absolute tops on the count and people in case they swap around when translated to other languages.
| * | Add text for people wanting to knowLouise Crow2015-04-28-3/+4
| | |
| * | Use title case - upcasing done in stylesheet.Louise Crow2015-04-28-16/+16
| | |
| * | Add status labelLouise Crow2015-04-28-0/+1
| | |