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

cff0292d

Commit cff0292d authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'reserve-user-names' into 'develop'

Reserve a few user names

See merge request pleroma/pleroma!594

parents 02866a42 1dd71026

Branches

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 33 additions, 2 deletions

config/config.exs
lib/pleroma/user.ex 1 addition, 0 deletions

lib/pleroma/user.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 2 additions, 1 deletion

lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
test/user_test.exs 14 additions, 0 deletions

test/user_test.exs
test/web/node_info_test.exs 11 additions, 0 deletions

test/web/node_info_test.exs

with 61 additions and 3 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