Merge remote-tracking branch 'origin' into dcc/lh-decideix-202304

coopanio · Apr 22, 2023 · 9be8c42 · 9be8c42
2 parents 89178d2 + e5029c0
commit 9be8c42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/sessions_mailer/user_magic_link_email.text.erb b/app/views/sessions_mailer/user_magic_link_email.text.erb
@@ -1,6 +1,6 @@
 <%= t('application_mailer.greeting') %>,
 
 <%= t('sessions_mailer.user_magic_link_email.body',
-    magic_link_url: magic_link_url(@token.to_hash)).strip %>
+    magic_link_url: magic_link_url(@voter_hash)).strip %>
 
 <%= t('application_mailer.complimentary_close', recipient: Rails.configuration.x.asembleo.title).strip %>
diff --git a/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb b/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb
@@ -2,6 +2,6 @@
 
 class RemoveTokenAndQuestionIndexFromReceipts < ActiveRecord::Migration[7.0]
   def change
-    remove_index :receipts, name: 'index_receipts_on_token_id_and_question_id'
+    remove_index :receipts, name: 'index_receipts_on_token_id_and_question_id' if index_exists?(:receipts, %i[token_id question_id], name: 'index_receipts_on_token_id_and_question_id')
   end
 end