projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bb68f9d
e1b0740
)
Merge branch 'features/users-raw_bio' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Wed, 17 Jun 2020 10:34:23 +0000
(10:34 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Wed, 17 Jun 2020 10:34:23 +0000
(10:34 +0000)
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/views/account_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/support/factory.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/views/account_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge
diff --cc
test/support/factory.ex
Simple merge
diff --cc
test/web/mastodon_api/views/account_view_test.exs
Simple merge