diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
| commit | 32c70d2f09e27c474b7e20ef3e3b34f5a7f50121 (patch) | |
| tree | 117e952f835329eadc0095e809427f7af5be9631 /app/views | |
| parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
| parent | b59ce0a60ff4f90bb16a8c3338ad37218af052b8 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/announcements/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/announcements/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/settings/registrations/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml index 0f9727014..fa69c6fab 100644 --- a/app/views/admin/announcements/edit.html.haml +++ b/app/views/admin/announcements/edit.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('.title') -= simple_form_for @announcement, url: admin_announcement_path(@announcement) do |f| += simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f| = render 'shared/error_messages', object: @announcement .fields-group diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml index b2f0c01ec..cb39672e1 100644 --- a/app/views/admin/announcements/new.html.haml +++ b/app/views/admin/announcements/new.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('.title') -= simple_form_for @announcement, url: admin_announcements_path do |f| += simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f| = render 'shared/error_messages', object: @announcement .fields-group diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml index 0d7d49dc8..455fa5eca 100644 --- a/app/views/admin/settings/registrations/show.html.haml +++ b/app/views/admin/settings/registrations/show.html.haml @@ -5,7 +5,7 @@ %h2= t('admin.settings.title') = render partial: 'admin/settings/shared/links' -= simple_form_for @admin_settings, url: admin_settings_branding_path, html: { method: :patch } do |f| += simple_form_for @admin_settings, url: admin_settings_registrations_path, html: { method: :patch } do |f| = render 'shared/error_messages', object: @admin_settings %p.lead= t('admin.settings.registrations.preamble') |