aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
Commit message (Collapse)AuthorAgeLines
* Merge branch 'release/0.9' into rails-3-developLouise Crow2013-04-24-2/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/public_body_controller.rb app/mailers/track_mailer.rb app/views/request/_hidden_correspondence.html.erb app/views/request/_sidebar.html.erb app/views/request/hidden.html.erb app/views/request/new_please_describe.html.erb app/views/request/preview.html.erb app/views/user/show.html.erb config/environment.rb config/routes.rb spec/controllers/public_body_controller_spec.rb
| * Restore call to N_Louise Crow2013-04-23-1/+1
| |
| * Fix the deadlock on dealing with incoming emailMark Longair2013-04-18-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #336 There was an occasional deadlock when two emails for the same request came in near-simultaneously; two processes would be started via script/mailin, each to deal with one email which are both updating the same InfoRequest. The error would look like: 2013-04-07 09:19:03 BST [13398]: [2-1] DETAIL: Process 13398 waits for ShareLock on transaction 36193647; blocked by process 13397. Process 13397 waits for ExclusiveLock on tuple (390,35) of relation 32918788 of database 32918687; blocked by process 13398. Process 13398: UPDATE "info_requests" SET "updated_at" = '2013-04-07 08:19:02.139515', "awaiting_description" = 't' WHERE "id" = 156200 Process 13397: UPDATE "info_requests" SET "updated_at" = '2013-04-07 08:19:02.143624', "awaiting_description" = 't' WHERE "id" = 156200 This arose from the following section of code: ActiveRecord::Base.transaction do raw_email = RawEmail.new incoming_message.raw_email = raw_email incoming_message.info_request = self incoming_message.save! raw_email.data = raw_email_data raw_email.save! self.awaiting_description = true params = { :incoming_message_id => incoming_message.id } if !rejected_reason.empty? params[:rejected_reason] = rejected_reason.to_str end self.log_event("response", params) self.save! end Matthew Somerville explained what was happening here in the issue report; to repeat his explanation from the bug report, both processes enter the transaction block and acquire a ShareLock on self with: incoming_message.info_request = self incoming_message.save! However, in order to update the self.awaiting_description field of the InfoRequest, with: self.awaiting_description = true [...] self.save! ... the ShareLock needs to be upgraded to an ExclusiveLock, but both will wait until the other's ShareLock is released, which would only happen at the end of the transaction. We can avoid this deadlock by using SELECT ... FOR UPDATE for the row in info_requests. In Rails 3.2.0 there is ActiveRecord support for this (via with_lock and lock! on a model instance) but so as not to require upgrading rails, I'm just using raw SQL.
| * Update outgoing message signoff translationLouise Crow2013-04-16-1/+1
| |
| * Merge branch 'feature/final-consistent-translation-interpolation' into developLouise Crow2013-04-16-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/outgoing_message.rb app/views/general/search.rhtml app/views/public_body/list.rhtml app/views/public_body/show.rhtml app/views/public_body/view_email.rhtml app/views/request/_after_actions.rhtml app/views/request/_followup.rhtml app/views/request/_sidebar.rhtml app/views/request/new.rhtml app/views/request/select_authority.rhtml app/views/request/upload_response.rhtml locale/aln/app.po locale/app.pot locale/ar/app.po locale/bs/app.po locale/ca/app.po locale/cs/app.po locale/cy/app.po locale/de/app.po locale/en/app.po locale/en_IE/app.po locale/es/app.po locale/eu/app.po locale/fr/app.po locale/gl/app.po locale/hu_HU/app.po locale/id/app.po locale/nb_NO/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sl/app.po locale/sq/app.po locale/sr@latin/app.po locale/tr/app.po locale/uk/app.po
| | * In translation strings replace %{} with {{}} formattingMatthew Landauer2013-04-15-1/+1
| | |
| | * In translation strings replace %{} with {{}} formattingMatthew Landauer2013-04-09-1/+1
| | |
| * | As much as possible use I18n.locale for getting the localeMatthew Landauer2013-04-02-2/+2
| | |
| * | Small refactorMatthew Landauer2013-04-02-6/+1
| | |
| * | Refactor using I18.with_localeMatthew Landauer2013-04-02-4/+3
| | |
| * | Set locale with I18n rather than through globalizeMatthew Landauer2013-04-02-4/+4
| | | | | | | | | | | | | | | | | | Conflicts: app/controllers/general_controller.rb
| * | Small refactoring in PublicBody.self.find_by_url_name_with_historic just use ↵Matthew Landauer2013-04-02-22/+19
| | | | | | | | | | | | the current locale
| * | Set locale in controller test by passing parameter in getMatthew Landauer2013-04-02-1/+1
| | | | | | | | | | | | Also using I18n.locale to pass the current locale around.
* | | Remove cvs tagMatthew Landauer2013-03-26-2/+0
| | |
* | | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-19/+19
| | |
* | | Replace use of Iconv in Ruby 1.9 to get rid of deprecation warningsHenare Degan2013-03-16-7/+23
| | |
* | | Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929daHenare Degan2013-03-15-1/+1
| | |
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-93/+102
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * | Merge remote-tracking branch ↵Louise Crow2013-03-13-112/+79
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/one_support_email_on_admin_attention_state' into develop Conflicts: Gemfile.lock app/controllers/request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml spec/models/request_mailer_spec.rb
| | * | Refactor functionality from controller to modelMatthew Landauer2013-03-04-0/+15
| | | |
| | * | When setting a state optionally pass a messsageMatthew Landauer2013-03-02-2/+2
| | | |
| | * | Add optional message to requires_admin emailMatthew Landauer2013-03-02-2/+2
| | | |
| | * | Avoid using return in the middle of methodsMatthew Landauer2013-03-02-7/+8
| | | |
| | * | Simplify method by using array to store mappingMatthew Landauer2013-03-02-39/+24
| | | |
| | * | InfoRequestEvent should know about its event typesMatthew Landauer2013-03-02-2/+10
| | | |
| | * | Simplify methodsMatthew Landauer2013-03-02-8/+3
| | | |
| | * | Extract methodMatthew Landauer2013-03-02-6/+5
| | | |
| | * | Simplify methodsMatthew Landauer2013-03-02-19/+7
| | | |
| | * | Simplify logic in methodMatthew Landauer2013-03-02-7/+2
| | | |
| | * | Inline methodMatthew Landauer2013-03-02-11/+1
| | | |
| | * | Inline methodMatthew Landauer2013-03-02-6/+1
| | | |
| | * | Small refactor.Matthew Landauer2013-03-02-5/+1
| | | |
| * | | Make view as html display as html5Matthew Landauer2013-03-07-2/+1
| | | |
| * | | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵Louise Crow2013-03-06-8/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop Conflicts: app/controllers/admin_request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/show.rhtml app/views/admin_user/show.rhtml app/views/layouts/admin.rhtml app/views/public_body/show.rhtml app/views/request/new.rhtml
| | * | | Inline helperMatthew Landauer2013-02-15-1/+1
| | | | |
| | * | | Stop using main_url to generate absolute urls for the main siteMatthew Landauer2013-02-15-7/+7
| | | | |
| | * | | Rename helper methodMatthew Landauer2013-02-15-3/+3
| | | | |
| | * | | Rename helper methodMatthew Landauer2013-02-15-1/+1
| | | | |
| | * | | Make tracking links relativeMatthew Landauer2013-02-13-0/+2
| | | | |
| * | | | Mark subjects of emails as html_safeMatthew Landauer2013-03-06-6/+6
| | |/ / | |/| |
| * | | Move test runner disabling to request mailer in order to have access to ↵Louise Crow2013-02-19-1/+5
| | | | | | | | | | | | | | | | rails environment and make hack specific to ruby 1.9.
| * | | Handle the case where the subject is not setLouise Crow2013-02-15-2/+2
| | | |
| * | | Fix for #808. SafeBuffer and ActionMailer::Quoting.quoted_printable don't ↵Louise Crow2013-02-15-0/+14
| |/ / | | | | | | | | | play well together, so convert all subject lines to strings before passing them off to actionmailer.
* | | Remove schema information as this won't be updated any moreHenare Degan2013-03-04-30/+0
| | |
* | | Convert validators to newer, more Railsy ActiveModelHenare Degan2013-03-04-19/+29
| | |
* | | We need to reload here in Rails 3.1 (caching?)Henare Degan2013-03-03-0/+3
| | |
* | | Rename Configuration class to avoid conflict with ActiveSupport::ConfigurableHenare Degan2013-03-03-26/+26
| | |
* | | In Ruby 1.9.3 we need to explicitly require iconv because it's not ↵Henare Degan2013-02-28-1/+1
| | | | | | | | | | | | implicitly loaded via Mail
* | | Remove Tmail and use the Mail gem under Ruby 1.8.7 as wellHenare Degan2013-02-27-8/+0
| | |
* | | Fix calculation of attachment sizes in Ruby 1.9.3Henare Degan2013-02-27-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | force_encoding is generally not a good idea and I can't see what it's trying to achieve here so... Revert "Use the character set of the attachment to encode the string that we're pulling out of the file before converting it to our default encoding." This reverts commit 3729f2053d4c04396d440a9c368bed174e9c9605.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 02:53:36 +0000