-
- Downloads
Merge branch 'stingrayza/add-mastodon' into 'master'
Add support for Mastodon as user social See merge request gitlab-org/gitlab!132892 Merged-by:Raimund Hook <rhook@gitlab.com> Approved-by:
Lorenz van Herwaarden <lvanherwaarden@gitlab.com> Approved-by:
Serena Fang <sfang@gitlab.com> Approved-by:
Greg Alfaro <galfaro@gitlab.com> Approved-by:
Adam Hegyi <ahegyi@gitlab.com> Reviewed-by:
Raimund Hook <rhook@gitlab.com> Reviewed-by:
Adam Hegyi <ahegyi@gitlab.com> Reviewed-by:
Dmitry Gruzd <dgruzd@gitlab.com> Reviewed-by:
Niklas <mc.taucher2003@gmail.com> Reviewed-by:
Mehmet Emin INAC <minac@gitlab.com> Co-authored-by:
Jon Glassman <jglassman@gitlab.com> Co-authored-by:
Niklas <mc.taucher2003@gmail.com>
No related branches found
No related tags found
Showing
- app/assets/stylesheets/framework/variables.scss 1 addition, 0 deletionsapp/assets/stylesheets/framework/variables.scss
- app/assets/stylesheets/page_bundles/profile.scss 4 additions, 0 deletionsapp/assets/stylesheets/page_bundles/profile.scss
- app/controllers/admin/users_controller.rb 2 additions, 1 deletionapp/controllers/admin/users_controller.rb
- app/controllers/profiles_controller.rb 2 additions, 1 deletionapp/controllers/profiles_controller.rb
- app/helpers/application_helper.rb 8 additions, 0 deletionsapp/helpers/application_helper.rb
- app/models/user.rb 1 addition, 0 deletionsapp/models/user.rb
- app/models/user_detail.rb 22 additions, 1 deletionapp/models/user_detail.rb
- app/views/profiles/show.html.haml 4 additions, 0 deletionsapp/views/profiles/show.html.haml
- app/views/users/show.html.haml 4 additions, 0 deletionsapp/views/users/show.html.haml
- config/feature_flags/development/mastodon_social_ui.yml 8 additions, 0 deletionsconfig/feature_flags/development/mastodon_social_ui.yml
- db/migrate/20230927124202_add_mastodon_to_user_details.rb 21 additions, 0 deletionsdb/migrate/20230927124202_add_mastodon_to_user_details.rb
- db/schema_migrations/20230927124202 1 addition, 0 deletionsdb/schema_migrations/20230927124202
- db/structure.sql 2 additions, 0 deletionsdb/structure.sql
- doc/user/profile/index.md 3 additions, 0 deletionsdoc/user/profile/index.md
- locale/gitlab.pot 3 additions, 0 deletionslocale/gitlab.pot
- spec/controllers/profiles_controller_spec.rb 10 additions, 0 deletionsspec/controllers/profiles_controller_spec.rb
- spec/helpers/application_helper_spec.rb 15 additions, 0 deletionsspec/helpers/application_helper_spec.rb
- spec/models/user_detail_spec.rb 23 additions, 0 deletionsspec/models/user_detail_spec.rb
- spec/models/user_spec.rb 3 additions, 0 deletionsspec/models/user_spec.rb
db/schema_migrations/20230927124202
0 → 100644
Please register or sign in to comment