diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /app/views/accounts | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 9c26dbabc..c312fe2bd 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -2,8 +2,6 @@ = "#{display_name(@account)} (@#{@account.local_username_and_domain})" - content_for :header_tags do - %meta{ name: 'description', content: account_description(@account) }/ - - if @account.user&.setting_noindex %meta{ name: 'robots', content: 'noindex, noarchive' }/ |