Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 18:13:30 -05:00
parent 99b2bc2668 f6bb50b6ec
commit 5cff053944
62 changed files with 868 additions and 195 deletions
--- a/app/views/accounts/_follow_button.html.haml
+++ b/app/views/accounts/_follow_button.html.haml
@ -15,6 +15,11 @@
        = link_to (account.local? ? account_follow_path(account) : authorize_follow_path(acct: account.acct)), data: { method: :post }, class: 'icon-button' do
          = fa_icon 'user-plus'
          = t('accounts.follow')
+  - elsif user_signed_in? && current_account.id == account.id
+    .controls
+      = link_to settings_profile_url, class: 'icon-button' do
+        = fa_icon 'pencil'
+        = t('settings.edit_profile')
  - elsif !user_signed_in?
    .controls
      .remote-follow