fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 14:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
12694 commits 131 branches 266 tags 989 MiB
Commit graph

12694 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
  Upstream changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/models/user.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc not preventing moved accounts from logging
  in.
  Ported upstream changes while keeping the ability for moved accounts to log
  in.
- `app/policies/status_policy.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's ability  to hide followers count.
  Ported upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `package.json`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
 2020-09-28 14:13:30 +02:00
Eugen Rochko d88a79b456
Add pop-out player for audio/video in web UI (#14870) 
Fix #11160
 2020-09-28 13:29:43 +02:00
ThibG 5bbc9a4f78
Fix downloading remote media files when server returns empty filename (#14867) 
Fixes #14817
 2020-09-27 22:00:43 +02:00
ThibG d60290044e
Add environment variable to allow requests to some private addresses (#14722) 2020-09-26 20:57:39 +02:00
ThibG ff89025979
Add unread notification markers (#14818) 
* Add unread notification markers

Fixes #14804

* Allow IntersectionObserverArticle's children to be updated
 2020-09-26 20:57:07 +02:00
Jeremy Rose 03b6b034b9
add og:published_time to opengraph meta tags (#14865) 2020-09-24 23:32:13 +02:00
Takeshi Umeda b655a7f88f
Fix a slow query for TagFeed (#14861) 
* Fix a slow query for TagFeed

* rename tags to tag_ids
 2020-09-23 16:01:54 +02:00
fuyu e39d97f700
Fix crash streaming process when receive invalid json (#14859) 2020-09-22 15:30:41 +02:00
dependabot[bot] b09810a505
Bump puma from 4.3.6 to 5.0.0 (#14830) 
Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.6...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 15:23:36 +02:00
dependabot[bot] 8f630552df
Bump terser-webpack-plugin from 3.0.6 to 4.2.2 (#14850) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 3.0.6 to 4.2.2.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.6...v4.2.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 16:53:56 +09:00
dependabot[bot] 2dee03900e
Bump parallel_tests from 3.2.0 to 3.3.0 (#14843) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md)
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.2.0...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 16:53:24 +09:00
dependabot[bot] 6926b771a5
Bump premailer from 1.13.1 to 1.14.2 (#14857) 
Bumps [premailer](https://github.com/premailer/premailer) from 1.13.1 to 1.14.2.
- [Release notes](https://github.com/premailer/premailer/releases)
- [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/premailer/premailer/compare/v1.13.1...v1.14.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 16:53:01 +09:00
dependabot[bot] a65ea99e3d
Bump browserslist from 4.14.1 to 4.14.3 (#14853) 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.1 to 4.14.3.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.1...4.14.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:47:09 +09:00
dependabot[bot] 24da180901
Bump rubocop from 0.90.0 to 0.91.0 (#14835) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.90.0 to 0.91.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.90.0...v0.91.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:36:46 +09:00
dependabot[bot] 8c6312f853
Bump nio4r from 2.5.3 to 2.5.4 (#14837) 
Bumps [nio4r](https://github.com/socketry/nio4r) from 2.5.3 to 2.5.4.
- [Release notes](https://github.com/socketry/nio4r/releases)
- [Changelog](https://github.com/socketry/nio4r/blob/master/CHANGES.md)
- [Commits](https://github.com/socketry/nio4r/compare/v2.5.3...v2.5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:35:45 +09:00
dependabot[bot] 61fcb33ff2
Bump pkg-config from 1.4.2 to 1.4.3 (#14838) 
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases)
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS)
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.2...1.4.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:35:30 +09:00
dependabot[bot] 36da58556c
Bump devise from 4.7.2 to 4.7.3 (#14845) 
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.2...v4.7.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:33:37 +09:00
dependabot[bot] 19353df01d
Bump crack from 0.4.3 to 0.4.4 (#14833) 
Bumps [crack](https://github.com/jnunemaker/crack) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/jnunemaker/crack/releases)
- [Changelog](https://github.com/jnunemaker/crack/blob/master/History)
- [Commits](https://github.com/jnunemaker/crack/compare/v0.4.3...v0.4.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:33:00 +09:00
dependabot[bot] cc8c7d6477
Bump rubocop-rails from 2.8.0 to 2.8.1 (#14832) 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.0...v2.8.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:31:39 +09:00
dependabot[bot] 687e04aaa0
Bump fugit from 1.3.8 to 1.3.9 (#14829) 
Bumps [fugit](https://github.com/floraison/fugit) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/floraison/fugit/releases)
- [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/floraison/fugit/compare/v1.3.8...v1.3.9)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 14:30:53 +09:00
Takeshi Umeda 070026e634
Fix method of the DELETE DATA button (#14855) 2020-09-21 20:37:19 +02:00
Eugen Rochko 8c8bf0289f
Fix not being able to enable status notifications in Web Push API (#14822) 2020-09-21 17:48:55 +02:00
dependabot[bot] 1ca5437521
Bump webpack from 4.44.1 to 4.44.2 (#14847) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.44.1 to 4.44.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.44.1...v4.44.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:31:46 +09:00
dependabot[bot] b9a28ba138
Bump escalade from 3.0.2 to 3.1.0 (#14851) 
Bumps [escalade](https://github.com/lukeed/escalade) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/lukeed/escalade/releases)
- [Commits](https://github.com/lukeed/escalade/compare/v3.0.2...v3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:30:28 +09:00
dependabot[bot] c5473bfe1b
Bump file-loader from 6.0.0 to 6.1.0 (#14854) 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v6.0.0...v6.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:29:33 +09:00
dependabot[bot] 8c1d8d81a3
Bump jest-worker from 26.2.1 to 26.3.0 (#14849) 
Bumps [jest-worker](https://github.com/facebook/jest/tree/HEAD/packages/jest-worker) from 26.2.1 to 26.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.3.0/packages/jest-worker)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:29:06 +09:00
dependabot[bot] aaae44ab85
Bump abab from 2.0.4 to 2.0.5 (#14844) 
Bumps [abab](https://github.com/jsdom/abab) from 2.0.4 to 2.0.5.
- [Release notes](https://github.com/jsdom/abab/releases)
- [Changelog](https://github.com/jsdom/abab/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsdom/abab/compare/2.0.4...2.0.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:28:35 +09:00
dependabot[bot] 9e489adb26
Bump dot-prop from 5.2.0 to 5.3.0 (#14842) 
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v5.2.0...v5.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:27:39 +09:00
dependabot[bot] c36e94f65b
Bump caniuse-lite from 1.0.30001129 to 1.0.30001133 (#14831) 
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001129 to 1.0.30001133.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases)
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001129...v1.0.30001133)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:26:48 +09:00
dependabot[bot] dd7c70a615
Bump aws-sdk-s3 from 1.80.0 to 1.81.0 (#14826) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.80.0 to 1.81.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 21:25:53 +09:00
dependabot[bot] 3e027a5dd3
Bump spdx-license-ids from 3.0.5 to 3.0.6 (#14852) 
Bumps [spdx-license-ids](https://github.com/jslicense/spdx-license-ids) from 3.0.5 to 3.0.6.
- [Release notes](https://github.com/jslicense/spdx-license-ids/releases)
- [Commits](https://github.com/jslicense/spdx-license-ids/compare/v3.0.5...v3.0.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 20:18:34 +09:00
dependabot[bot] 76adfb7173
Bump object.assign from 4.1.0 to 4.1.1 (#14828) 
Bumps [object.assign](https://github.com/ljharb/object.assign) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/ljharb/object.assign/releases)
- [Changelog](https://github.com/ljharb/object.assign/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/object.assign/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 16:12:59 +09:00
dependabot[bot] 41bf9384ae
Bump better_errors from 2.7.1 to 2.8.1 (#14825) 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.7.1 to 2.8.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.7.1...v2.8.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 16:12:11 +09:00
dependabot[bot] b7d7485fe3
Bump faker from 2.13.0 to 2.14.0 (#14824) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.13.0...v2.14.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 16:11:55 +09:00
dependabot[bot] aeeb0252a4
Bump @github/webauthn-json from 0.4.2 to 0.5.4 (#14823) 
Bumps [@github/webauthn-json](https://github.com/github/webauthn-json) from 0.4.2 to 0.5.4.
- [Release notes](https://github.com/github/webauthn-json/releases)
- [Commits](https://github.com/github/webauthn-json/compare/v0.4.2...v0.5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 16:10:15 +09:00
Thibaut Girka 787d5d7289 Fix minor bugs 2020-09-19 15:01:46 +02:00
Thibaut Girka 312c936d51 Minor refactoring and fixups 2020-09-19 14:15:28 +02:00
Thibaut Girka 85b9086e6b Filter out mounted lists from “getting started” column 2020-09-18 20:07:25 +02:00
Eugen Rochko 974b1b79ce
Add option to be notified when a followed user posts (#13546) 
* Add bell button

Fix #4890

* Remove duplicate type from post-deployment migration

* Fix legacy class type mappings

* Improve query performance with better index

* Fix validation

* Remove redundant index from notifications
 2020-09-18 17:26:45 +02:00
Thibaut Girka a681980307 Submit timeline markers closer to the moment they change 2020-09-17 15:22:56 +02:00
Thibaut Girka 60eebc6cc4 Fix crashes when connection drops 2020-09-17 15:22:56 +02:00
Thibaut Girka f1c0cf9806 Add button to manually mark all notifications as read 2020-09-17 15:22:56 +02:00
Thibaut Girka 94c290d7d2 Only update read marker when giving focus/mounting column 2020-09-17 15:22:56 +02:00
Thibaut Girka 145ed37978 Refactor and change logic to only update marker if we reached the last 
read notification.
 2020-09-17 15:22:56 +02:00
Thibaut Girka 66e9a77e36 Display unread marker for notifications 2020-09-17 15:22:56 +02:00
Thibaut Girka ae698469d0 Clean up leftover from DM conversation view redesign 2020-09-17 15:22:56 +02:00
dependabot[bot] 75e4bd9413
Bump thor from 0.20.3 to 1.0.1 (#14783) 
Bumps [thor](https://github.com/erikhuda/thor) from 0.20.3 to 1.0.1.
- [Release notes](https://github.com/erikhuda/thor/releases)
- [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/erikhuda/thor/compare/v0.20.3...v1.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-16 20:40:12 +02:00
dependabot[bot] 4de893113b
Bump rubocop-ast from 0.3.0 to 0.4.0 (#14785) 
Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.3.0...v0.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-16 20:39:05 +02:00
dependabot[bot] 5d8660fc3c
Bump axios from 0.19.2 to 0.20.0 (#14791) 
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.20.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.20.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-16 20:34:10 +02:00
mayaeh 18c03c18f1
Bump selfsigned from 1.10.7 to 1.10.8 and bump node-forge from 0.9.0 to 0.10.0. (#14807) 
https://github.com/jfromaniello/selfsigned/compare/v1.10.7...v1.10.8
https://github.com/digitalbazaar/forge/compare/0.9.0...0.10.0
 2020-09-16 20:33:18 +02:00