diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
| commit | d8fdbb054e30f6e8e505bce63e5f150bf117cd8e (patch) | |
| tree | 0a671ee6c8a7644e6613dd87798f661f4703e8fe /app/views | |
| parent | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (diff) | |
| parent | 65db2625508c220fd3c0a1f37cdd2e13b6e02987 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/about/more.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/account_actions/new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 45675224b..1cf194522 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -42,7 +42,7 @@ .column-3 = render 'application/flashes' - - if @contents.blank? && (!display_blocks? || @blocks&.empty?) + - if @contents.blank? && @rules.empty? && (!display_blocks? || @blocks&.empty?) = nothing_here - else .box-widget diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml index aa88b1448..ca4f9663f 100644 --- a/app/views/admin/account_actions/new.html.haml +++ b/app/views/admin/account_actions/new.html.haml @@ -5,7 +5,7 @@ = f.input :report_id, as: :hidden .fields-group - = f.input :type, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { I18n.t("simple_form.labels.admin_account_action.types.#{type}")}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.acct) + = f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { safe_join([I18n.t("simple_form.labels.admin_account_action.types.#{type}"), content_tag(:span, I18n.t("simple_form.hints.admin_account_action.types.#{type}"), class: 'hint')])}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.acct) - if @account.local? %hr.spacer/ |