Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

b73a1a33

Commit b73a1a33 authored 6 years ago by rinpatch

Downloads
- Plain Diff

Merge branch 'captcha' into 'develop'

Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585

parents 9ef664ff 816db3f4

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 1 addition, 1 deletion

config/config.exs
config/test.exs 2 additions, 1 deletion

config/test.exs
docs/config.md 1 addition, 1 deletion

docs/config.md
lib/pleroma/application.ex 10 additions, 0 deletions

lib/pleroma/application.ex
lib/pleroma/captcha/captcha.ex 64 additions, 23 deletions

lib/pleroma/captcha/captcha.ex
lib/pleroma/captcha/captcha_service.ex 13 additions, 8 deletions

lib/pleroma/captcha/captcha_service.ex
lib/pleroma/captcha/kocaptcha.ex 12 additions, 46 deletions

lib/pleroma/captcha/kocaptcha.ex
lib/pleroma/web/twitter_api/twitter_api.ex 11 additions, 5 deletions

lib/pleroma/web/twitter_api/twitter_api.ex
test/captcha_test.exs 10 additions, 8 deletions

test/captcha_test.exs
test/support/captcha_mock.ex 1 addition, 4 deletions

test/support/captcha_mock.ex

with 125 additions and 97 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment