github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-14 17:23:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Correct merge conflicts for 9cfe3f99

Browse Source
This commit is contained in:
David Taylor 2019-07-24 13:31:16 +01:00
parent 9cfe3f9948
commit c4ff66e1a5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -134,9 +134,7 @@
<td>{{authProvider.account.description}}</td> <td>{{authProvider.account.description}}</td>
<td> <td>
{{#if authProvider.method.can_revoke}} {{#if authProvider.method.can_revoke}}
{{#conditional-loading-spinner condition=revoking size='small'}} {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" disabled=(get revoking authProvider.method.name) }}
{{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" }}
{{/conditional-loading-spinner}}
{{/if}} {{/if}}
</td> </td>
{{else}} {{else}}

2
spec/requests/omniauth_callbacks_controller_spec.rb
View File

@ -487,7 +487,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.redirect_url).to start_with("http://test.localhost/associate/") expect(response.redirect_url).to start_with("http://test.localhost/associate/")
expect(session[:current_user_id]).to eq(user.id) expect(session[:current_user_id]).to eq(user.id)
expect(UserAssociatedAccount.count).to eq(0) # Reconnect has not yet happened expect(UserAssociatedAccount.count).to eq(1) # Reconnect has not yet happened
end end
end end