diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
| commit | cd99255698354f3b5ec1c0d5d9bc1b4fb9bffdf3 (patch) | |
| tree | 0486b73191a98645e0620fefe8743f4a0c44bef5 /app/views/layouts/modal.html.haml | |
| parent | 65f625cf237feb55a21495606d5e2c258bbe50cc (diff) | |
| parent | bda0f7ac7353a63b42ca99b2e7d4e80a3b03b850 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
Diffstat (limited to 'app/views/layouts/modal.html.haml')
| -rw-r--r-- | app/views/layouts/modal.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml index a86b4fd3f..b6e33ca91 100644 --- a/app/views/layouts/modal.html.haml +++ b/app/views/layouts/modal.html.haml @@ -5,7 +5,7 @@ .name = t 'users.signed_in_as' %span.username @#{current_account.local_username_and_domain} - = link_to destroy_user_session_path, method: :delete, class: 'logout-link icon-button' do + = link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button' do = fa_icon 'sign-out' .container-alt= yield |