3622110778
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Filtering code for streaming notifications has been refactored upstream, but
glitch-soc had similar code for local-only toots in the same places.
Ported upstream changes, but did not refactor local-only filtering.
3 years ago
a0d4129893
Refactor notifications to go through a separate stream in streaming API ( #16765 )
...
Eliminate need to have custom notifications filtering logic in the
streaming API code by publishing notifications into a separate stream
and then simply using the multi-stream capability to subscribe to that
stream when necessary
3 years ago
52e5c07948
Change routing paths to use usernames in web UI ( #16171 )
3 years ago
4b7e436026
Merge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
7c25251a39
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
9c92907681
Bump tmpl from 1.0.4 to 1.0.5 ( #16762 )
...
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl ) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases )
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5 )
---
updated-dependencies:
- dependency-name: tmpl
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
062a9e3c79
helm: set default SMTP_CA_FILE ( #16750 )
...
https://github.com/mastodon/mastodon/pull/10857
3 years ago
3d05ebfdc3
Merge pull request #1604 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
bf827b17e1
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
9d624247f6
Bump babel-jest from 27.1.0 to 27.2.0 ( #16738 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.1.0 to 27.2.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.2.0/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
8b9a81473f
Bump oj from 3.13.4 to 3.13.7 ( #16751 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.4 to 3.13.7.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.4...v3.13.7 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
8e5e6ef144
Bump bundler-audit from 0.8.0 to 0.9.0.1 ( #16701 )
...
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit ) from 0.8.0 to 0.9.0.1.
- [Release notes](https://github.com/postmodern/bundler-audit/releases )
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md )
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.8.0...v0.9.0.1 )
---
updated-dependencies:
- dependency-name: bundler-audit
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
87dc2ae490
Bump @testing-library/react from 12.0.0 to 12.1.0 ( #16741 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.0.0 to 12.1.0.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.0.0...v12.1.0 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
038db95026
Bump sass from 1.39.0 to 1.39.2 ( #16740 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.39.0 to 1.39.2.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.39.0...1.39.2 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
02cef343eb
Bump ws from 8.2.1 to 8.2.2 ( #16739 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.2.1 to 8.2.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.2.1...8.2.2 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
7bd40f67be
Bump jest from 27.1.0 to 27.2.0 ( #16737 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.1.0 to 27.2.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.1.0...v27.2.0 )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
ec6c50a61f
Bump parallel from 1.20.1 to 1.21.0 ( #16736 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.20.1 to 1.21.0.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.20.1...v1.21.0 )
---
updated-dependencies:
- dependency-name: parallel
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
09b2e64f03
Bump @babel/preset-env from 7.15.4 to 7.15.6 ( #16742 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.15.4 to 7.15.6.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.15.6/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
d64055c060
Bump bootsnap from 1.6.0 to 1.8.1 ( #16677 )
...
* Bump bootsnap from 1.6.0 to 1.8.1
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.6.0 to 1.8.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.6.0...v1.8.1 )
---
updated-dependencies:
- dependency-name: bootsnap
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Remove deprecated bootsnap config options
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
e0af97164a
Fix followers synchronization mechanism not working when URI has empty path ( #16744 )
...
Follow-up to #16510 , forgot the controller exposing the actual followers…
3 years ago
35469b1952
Merge pull request #1602 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
8f7308da81
Bump rubocop-rails from 2.11.3 to 2.12.2 ( #16734 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.11.3 to 2.12.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.11.3...v2.12.2 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
f1e6884d6b
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
121c7a7847
Bump rubocop from 1.20.0 to 1.21.0 ( #16733 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.20.0...v1.21.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
f50038ad2b
Bump http from 5.0.1 to 5.0.2 ( #16732 )
...
Bumps [http](https://github.com/httprb/http ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/httprb/http/releases )
- [Changelog](https://github.com/httprb/http/blob/main/CHANGES.md )
- [Commits](https://github.com/httprb/http/compare/v5.0.1...v5.0.2 )
---
updated-dependencies:
- dependency-name: http
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
12cb6ed461
Update Dockerfile ( #16696 )
3 years ago
3d98f31c65
Fix some Rails frameworks being unnecessarily loaded ( #16725 )
...
Saves about 10MiB of memory usage at boot
3 years ago
db57bff11d
Stop setting a shortcode to newly-created media attachments ( #16730 )
...
* Stop setting a shortcode to newly-created media attachments
The WebUI has stopped using the “short media URL” in ages. This isn't used
anywhere except for mail notifications.
Deprecating it would allow us to eventually get rid of at least a database
column and corruption-prone index, as well as a controller.
* Fix tests
3 years ago
75027b51a4
Bump ruby-saml from 1.11.0 to 1.13.0 ( #16723 )
...
Fixes #16720
3 years ago
b4a728b7ba
Bump @babel/plugin-proposal-decorators from 7.14.5 to 7.15.4 ( #16711 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.14.5 to 7.15.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.15.4/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
6e0d3c181d
Bump @babel/preset-env from 7.15.0 to 7.15.4 ( #16706 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.15.0 to 7.15.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.15.4/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
7aa4d481db
Fix media icons not being added in CWs
3 years ago
c5606db9da
Bump devise-two-factor from 4.0.0 to 4.0.1 ( #16705 )
...
Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/tinfoil/devise-two-factor/releases )
- [Changelog](https://github.com/tinfoil/devise-two-factor/blob/main/CHANGELOG.md )
- [Commits](https://github.com/tinfoil/devise-two-factor/compare/v4.0.0...v4.0.1 )
---
updated-dependencies:
- dependency-name: devise-two-factor
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
eb837b3cb3
Bump sass from 1.38.2 to 1.39.0 ( #16707 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.38.2 to 1.39.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.38.2...1.39.0 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
b61bdf83f3
Bump axios from 0.21.1 to 0.21.4 ( #16709 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.21.1 to 0.21.4.
- [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.21.1...v0.21.4 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
b09b28ce28
Bump @babel/runtime from 7.15.3 to 7.15.4 ( #16710 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.15.3 to 7.15.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.15.4/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
bcfbd53d5b
Bump react-redux from 7.2.4 to 7.2.5 ( #16708 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.2.4 to 7.2.5.
- [Release notes](https://github.com/reduxjs/react-redux/releases )
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.4...v7.2.5 )
---
updated-dependencies:
- dependency-name: react-redux
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
02952bde96
Bump npmlog from 5.0.0 to 5.0.1 ( #16704 )
...
Bumps [npmlog](https://github.com/npm/npmlog ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/npm/npmlog/releases )
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md )
- [Commits](https://github.com/npm/npmlog/compare/v5.0.0...v5.0.1 )
---
updated-dependencies:
- dependency-name: npmlog
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
abed4fe4e5
Bump oj from 3.13.2 to 3.13.4 ( #16703 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.2 to 3.13.4.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.2...v3.13.4 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
ba957156f9
Bump aws-sdk-s3 from 1.100.0 to 1.102.0 ( #16702 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.100.0 to 1.102.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
da38b11683
Bump @babel/core from 7.15.0 to 7.15.5 ( #16712 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.15.0 to 7.15.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.15.5/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
209f8f3a60
use relative path for `scope` ( #16714 )
...
Use relative path for `scope` in web manifest to allow users use PWA correctly via alternate domains.
3 years ago
12cd097e7c
Fix addressing of remote groups' followers ( #16700 )
...
Fixes #16699
3 years ago
4a94f4127b
Fix glitch-soc front-end not linking to the provided SOURCE_URL
3 years ago
6bbcd99f14
Fix media attachments not being displayed on polls
...
Fixes #1595
3 years ago
e2921375c3
Merge pull request #1597 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
5d81d621b6
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
127aaa8174
Merge pull request #1594 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
7c7e78d807
Fix suspicious sign-in mail text being out of date ( #16690 )
...
Fixes #16687
3 years ago
f9185c72a9
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire