Merge tag 'v4.2.1' into tedomum
No related branches found
No related tags found
Showing
- .rubocop_todo.yml 0 additions, 4 deletions.rubocop_todo.yml
- CHANGELOG.md 40 additions, 0 deletionsCHANGELOG.md
- Gemfile.lock 1 addition, 1 deletionGemfile.lock
- SECURITY.md 1 addition, 0 deletionsSECURITY.md
- app/controllers/concerns/web_app_controller_concern.rb 6 additions, 4 deletionsapp/controllers/concerns/web_app_controller_concern.rb
- app/controllers/follower_accounts_controller.rb 0 additions, 1 deletionapp/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb 0 additions, 1 deletionapp/controllers/following_accounts_controller.rb
- app/helpers/database_helper.rb 15 additions, 2 deletionsapp/helpers/database_helper.rb
- app/javascript/mastodon/actions/search.js 4 additions, 0 deletionsapp/javascript/mastodon/actions/search.js
- app/javascript/mastodon/components/__tests__/hashtag_bar.tsx 15 additions, 0 deletionsapp/javascript/mastodon/components/__tests__/hashtag_bar.tsx
- app/javascript/mastodon/components/admin/Retention.jsx 3 additions, 2 deletionsapp/javascript/mastodon/components/admin/Retention.jsx
- app/javascript/mastodon/components/column.jsx 0 additions, 6 deletionsapp/javascript/mastodon/components/column.jsx
- app/javascript/mastodon/components/hashtag_bar.tsx 1 addition, 1 deletionapp/javascript/mastodon/components/hashtag_bar.tsx
- app/javascript/mastodon/components/scrollable_list.jsx 1 addition, 1 deletionapp/javascript/mastodon/components/scrollable_list.jsx
- app/javascript/mastodon/features/explore/index.jsx 38 additions, 40 deletionsapp/javascript/mastodon/features/explore/index.jsx
- app/javascript/mastodon/features/explore/links.jsx 1 addition, 1 deletionapp/javascript/mastodon/features/explore/links.jsx
- app/javascript/mastodon/features/explore/results.jsx 1 addition, 1 deletionapp/javascript/mastodon/features/explore/results.jsx
- app/javascript/mastodon/features/explore/suggestions.jsx 1 addition, 1 deletionapp/javascript/mastodon/features/explore/suggestions.jsx
- app/javascript/mastodon/features/explore/tags.jsx 1 addition, 1 deletionapp/javascript/mastodon/features/explore/tags.jsx
- app/javascript/mastodon/features/firehose/index.jsx 22 additions, 24 deletionsapp/javascript/mastodon/features/firehose/index.jsx
Loading
Please register or sign in to comment