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

d03a1166

Commit d03a1166 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'hj-happiness-improvement' into 'develop'

New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700

parents ebb34963 f53d464d

Branches

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 19 additions, 0 deletions

config/config.exs
docs/config.md 17 additions, 0 deletions

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

lib/pleroma/application.ex
lib/pleroma/config/deprecation_warnings.ex 20 additions, 0 deletions

lib/pleroma/config/deprecation_warnings.ex
lib/pleroma/web/router.ex 1 addition, 0 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 33 additions, 19 deletions

lib/pleroma/web/twitter_api/controllers/util_controller.ex
priv/static/images/city.jpg 0 additions, 0 deletions

priv/static/images/city.jpg
test/web/twitter_api/util_controller_test.exs 67 additions, 0 deletions

test/web/twitter_api/util_controller_test.exs

with 159 additions and 19 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