Skip to content

Commit 291d411

Browse files
authored
Merge pull request #1060 from amatsuda/more_turbo_optins
Two more Turbo opt-ins similar to ea120a4
2 parents cb4b782 + 5c0ed71 commit 291d411

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

app/views/profiles/merge.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636

3737
.mt-4.d-flex.justify-content-between
3838
= link_to 'Cancel', edit_profile_path, class: 'btn btn-secondary'
39-
= button_to 'Merge Accounts', merge_profile_path, class: 'btn btn-primary', data: {turbo_confirm: 'Are you sure you want to merge these accounts? This cannot be undone.'}
39+
= button_to 'Merge Accounts', merge_profile_path, class: 'btn btn-primary', form: {data: {turbo: true}}, data: {turbo_confirm: 'Are you sure you want to merge these accounts? This cannot be undone.'}

app/views/staff/speaker_email_templates/edit.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.form-group.template-actions
66
%button.btn.btn-sm.btn-success{type: 'submit'} Save
77
= link_to "Remove", event_staff_speaker_email_template_path(@event, @type_key), class: "btn btn-sm btn-danger",
8-
data: {turbo_method: :delete, turbo_confirm: 'This template will be erased and the default template will be used instead. Proceed?'}
8+
data: {turbo: true, turbo_method: :delete, turbo_confirm: 'This template will be erased and the default template will be used instead. Proceed?'}
99
= link_to "Cancel", event_staff_speaker_email_template_path(@event, @type_key), class: "btn btn-sm btn-gray"
1010
.form-group
1111
= f.text_area @type_key, class: 'form-control', rows: 20, placeholder: "Please enter some text", value: @text, autofocus: true

0 commit comments

Comments
 (0)