Fix embed width, light theme embeds #2

Merged

chr merged 2 commits from nightpool/mastodon:light_theme_inline_embeds into cybrespace 2018-11-20 07:27:41 +01:00

Conversation 2 Commits 2 Files Changed 3 +14 -22

nightpool commented 2018-11-19 00:39:19 +01:00

Member

Copy Link

No description provided.

nightpool commented 2018-11-19 00:41:48 +01:00

Author

Member

Copy Link

i'm going to try to get 07066bf5bb cherry-picked into master, but who knows how long it'll take until we get that :P

i'm going to try to get 07066bf5bb cherry-picked into master, but who knows how long it'll take until we get that :P

chr commented 2018-11-20 07:18:32 +01:00

Owner

Copy Link

lgtm

lgtm

chr closed this pull request 2018-11-20 07:27:41 +01:00

chr referenced this issue from a commit 2019-01-21 05:32:40 +01:00

Fix embed width, light theme embeds (#2)

chr referenced this issue from a commit 2020-02-16 22:05:47 +01:00

LDAP & PAM added to OAuth password grant strategy (#7999) (#12390) When authenticating via OAuth, the resource owner password grant strategy is allowed by Mastodon, but (without this PR), it does not attempt to authenticate against LDAP or PAM. As a result, LDAP or PAM authenticated users cannot sign in to Mastodon with their email/password credentials via OAuth (for instance, for native/mobile app users). This PR fleshes out the authentication strategy supplied to doorkeeper in its initializer by looking up the user with LDAP and/or PAM when devise is configured to use LDAP/PAM backends. It attempts to follow the same logic as the Auth::SessionsController for handling email/password credentials. Note #1: Since this pull request affects an initializer, it's unclear how to add test automation. Note #2: The PAM authentication path has not been manually tested. It was added for completeness sake, and it is hoped that it can be manually tested before merging.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No Label

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: cybrespace/mastodon#2

No description provided.