diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
| commit | 59864ff495cb607b4e2632b8b8ca183c1e602626 (patch) | |
| tree | 7dfc6dc1fff3d8864497d0ed32aff5862b5e47e9 /app/views/admin/accounts | |
| parent | 9ff119eecd1079e52a8a41d7b8d61520c4303c2f (diff) | |
| parent | 67d550830b3b1a9a2b65b1ab98ea4bcd491666c5 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.
Diffstat (limited to 'app/views/admin/accounts')
| -rw-r--r-- | app/views/admin/accounts/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml index fc667b376..0290df7de 100644 --- a/app/views/admin/accounts/index.html.haml +++ b/app/views/admin/accounts/index.html.haml @@ -33,7 +33,7 @@ = hidden_field_tag key, params[key] - %i(username by_domain display_name email ip).each do |key| - - unless key == :by_domain && params[:remote].blank? + - unless key == :by_domain && params[:origin] != 'remote' .input.string.optional = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}") diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 9a1f07a06..805cf8a4f 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = @account.acct + = @account.pretty_acct - if @account.instance_actor? .flash-message.notice |