Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

9cf4bfcd

Commit 9cf4bfcd authored 4 years ago by Haelwenn

Downloads
- Plain Diff

Merge branch 'chore/rename-user-settings-column' into 'develop'

Rename user.settings column

See merge request pleroma/pleroma!2707

parents b9e6ad57 d69af7f7

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 3 additions, 3 deletions

lib/pleroma/user.ex
lib/pleroma/web/views/masto_fe_view.ex 1 addition, 1 deletion

lib/pleroma/web/views/masto_fe_view.ex
priv/repo/migrations/20200630162024_rename_user_settings_col.exs 11 additions, 0 deletions

...po/migrations/20200630162024_rename_user_settings_col.exs
test/web/masto_fe_controller_test.exs 1 addition, 1 deletion

test/web/masto_fe_controller_test.exs

with 16 additions and 5 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