Claire
6ff52096d7
Fix server rules not being displayed if extended server discription isn't set ( #15778 )
2021-02-22 18:26:24 +01:00
abcang
20efc1b816
[Glitch] Fix default searchTokens
...
Port 6faf654c43
2021-02-22 15:47:17 +01:00
Eugen Rochko
dc7c948820
[Glitch] Add server rules
...
Port SCSS changes from 4930e71ae7
2021-02-22 15:45:28 +01:00
Claire
dd60ecfc04
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
abcang
6faf654c43
Fix default searchTokens ( #15775 )
2021-02-22 11:26:08 +01:00
Eugen Rochko
4930e71ae7
Add server rules ( #15769 )
2021-02-21 19:50:12 +01:00
dependabot[bot]
a74d700799
Bump rails from 5.2.4.4 to 5.2.4.5 ( #15729 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.4.4 to 5.2.4.5.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.4.4...v5.2.4.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 21:38:05 +09:00
dependabot[bot]
40de97b73e
Bump @babel/preset-env from 7.12.16 to 7.12.17 ( #15766 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.16 to 7.12.17.
- [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.12.17/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 21:37:37 +09:00
dependabot[bot]
fb6b9dc03d
Bump sass from 1.32.7 to 1.32.8 ( #15760 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.7 to 1.32.8.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.32.7...1.32.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:02:48 +09:00
dependabot[bot]
c8ff41a864
Bump mini-css-extract-plugin from 1.3.6 to 1.3.8 ( #15761 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.3.6 to 1.3.8.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.3.6...v1.3.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:02:03 +09:00
dependabot[bot]
c5d1e88c43
Bump wicg-inert from 3.1.0 to 3.1.1 ( #15763 )
...
Bumps [wicg-inert](https://github.com/WICG/inert ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/WICG/inert/releases )
- [Commits](https://github.com/WICG/inert/compare/v3.1.0...v3.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:01:35 +09:00
dependabot[bot]
821b7ea468
Bump @babel/runtime from 7.12.13 to 7.12.18 ( #15765 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.12.13 to 7.12.18.
- [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.12.18/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:00:56 +09:00
dependabot[bot]
1e2a35473d
Bump @babel/plugin-transform-runtime from 7.12.15 to 7.12.17 ( #15764 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.12.15 to 7.12.17.
- [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.12.17/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:00:16 +09:00
dependabot[bot]
3006f70467
Bump @rails/ujs from 6.1.2 to 6.1.3 ( #15759 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.2...v6.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 15:59:43 +09:00
dependabot[bot]
ef130dc186
Bump @babel/core from 7.12.16 to 7.12.17 ( #15762 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.16 to 7.12.17.
- [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.12.17/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 15:58:19 +09:00
dependabot[bot]
ea4593948f
Bump puma from 5.1.1 to 5.2.1 ( #15670 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.1.1 to 5.2.1.
- [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/v5.1.1...v5.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 15:55:12 +09:00
dependabot[bot]
0244eda623
Bump eslint from 7.19.0 to 7.20.0 ( #15733 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.19.0 to 7.20.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.19.0...v7.20.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19 18:10:07 +09:00
dependabot[bot]
01531c9a5b
Bump simple_form from 5.0.3 to 5.1.0 ( #15732 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 5.0.3 to 5.1.0.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.3...v5.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19 18:09:30 +09:00
dependabot[bot]
e4b4305c58
Bump faker from 2.15.1 to 2.16.0 ( #15735 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.15.1 to 2.16.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.15.1...v2.16.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19 18:08:09 +09:00
dependabot[bot]
b392126575
Bump aws-sdk-s3 from 1.88.0 to 1.88.1 ( #15730 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.88.0 to 1.88.1.
- [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>
2021-02-19 18:07:40 +09:00
Alex Dunn
30997cc3be
dockerignore helm chart ( #15747 )
2021-02-19 09:57:03 +01:00
Alex Dunn
10112b556d
helm: pin versions, commit lockfile ( #15749 )
2021-02-19 09:56:40 +01:00
Justin Tracey
cbcf083cb4
replace all instances of "ends_with?" with "end_with?" ( #15745 )
...
The "ends_with?" method is just a Rails alias of Ruby's "end_with?" method.
Using the latter makes the code less brittle.
2021-02-19 09:56:14 +01:00
Shubhendra Singh Chauhan
3168011b4e
Update .deepsource.toml ( #15753 )
2021-02-19 09:53:25 +01:00
Shlee
b6b7b6a1f5
Delete pagination.rb ( #15754 )
2021-02-19 09:52:58 +01:00
Alex Dunn
a2a40ed236
helm: add support for S3 storage ( #15748 )
2021-02-19 09:52:32 +01:00
Eugen Rochko
e4ba5635ee
Add GET /api/v1/accounts/lookup REST API ( #15740 )
2021-02-16 15:28:32 +01:00
Justin Tracey
adb482477e
use host instead of headers to make Rack happy ( #15741 )
...
"headers" is provided by Rails, Rack can't rely on it
2021-02-16 15:28:17 +01:00
Alex Dunn
4c665f929e
helm: standardize yaml configuration ( #15728 )
...
- move application variables under `mastodon` namespace
- restore standard yaml structure for ingress configuration
- move values.yaml.template to values.yaml
2021-02-15 08:00:54 +01:00
Alex Dunn
bad5cb7a06
helm: add option for external db ( #15722 )
2021-02-14 20:16:32 +01:00
Cecylia Bocovich
6f95d30ef9
Monkey patch Rack::Session to send secure cookies to onions ( #15725 )
2021-02-14 00:10:52 +01:00
Claire
cef72ebd50
Merge pull request #1500 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-02-12 14:02:24 +01:00
dependabot[bot]
cb478a78b6
Bump detect-passive-events from 2.0.2 to 2.0.3 ( #15715 )
...
Bumps [detect-passive-events](https://github.com/rafgraph/detect-passive-events ) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/rafgraph/detect-passive-events/releases )
- [Commits](https://github.com/rafgraph/detect-passive-events/compare/v2.0.2...v2.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-12 20:39:28 +09:00
Claire
12d91755f5
[Glitch] Add dropdown for boost privacy in boost confirmation modal
...
Port c848e85068
2021-02-12 12:31:49 +01:00
Claire
cc5b429545
Refactor privacy dropdown to have an interface closer to upstream's
2021-02-12 12:04:04 +01:00
kaias1jp
5f403bb57a
[Glitch] Fixed WebUI crash when a status opened in the media modal is deleted
...
Port 7004e88738
2021-02-12 10:58:34 +01:00
Jeong Arm
77f7de53e1
[Glitch] Use custom mascot on static share page
...
Port b2572f0b29
2021-02-12 10:57:09 +01:00
Mélanie Chauvel
f419096f3b
[Glitch] Slightly reorder three dots menu on toots to make it more intuitive
...
Port e48633f3cf
2021-02-12 10:55:37 +01:00
Eugen Rochko
d66867d1c2
[Glitch] Change max. image dimensions to 1920x1080px (1080p)
...
Port 826a5cc624
2021-02-12 10:46:00 +01:00
Claire
489a5a539c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
For some reason we changed the file loading path in glitch-soc,
but now upstream has completely changed how the logo is loaded.
Applied upstream changes.
2021-02-12 10:28:32 +01:00
Eugen Rochko
ecfcdc856b
Refactor Api::Web::SettingsController ( #15717 )
2021-02-12 07:19:15 +01:00
Eugen Rochko
0baa928e56
Fix YouTube embeds failing due to YouTube serving wrong OEmbed URLs ( #15716 )
2021-02-12 05:45:38 +01:00
dependabot[bot]
a042276ae4
Bump @babel/preset-env from 7.12.13 to 7.12.16 ( #15713 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.13 to 7.12.16.
- [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.12.16/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-12 13:29:34 +09:00
dependabot[bot]
c37daea8f8
Bump @babel/core from 7.12.13 to 7.12.16 ( #15714 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.13 to 7.12.16.
- [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.12.16/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-12 13:29:08 +09:00
dependabot[bot]
21e7961549
Bump @babel/runtime from 7.12.5 to 7.12.13 ( #15684 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.12.5 to 7.12.13.
- [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.12.13/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-12 10:15:19 +09:00
dependabot[bot]
70c2f9f74d
Bump @babel/plugin-proposal-decorators from 7.12.12 to 7.12.13 ( #15685 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.12.12 to 7.12.13.
- [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.12.13/packages/babel-plugin-proposal-decorators )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-12 10:14:32 +09:00
dependabot[bot]
981178fb06
Bump @babel/plugin-transform-react-inline-elements ( #15675 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.12.1 to 7.12.13.
- [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.12.13/packages/babel-plugin-transform-react-inline-elements )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-12 09:31:55 +09:00
Claire
e47570388a
Drop dependency on secure_headers, fix response headers ( #15712 )
...
* Drop dependency on secure_headers, use always_write_cookie instead
* Fix cookies in Tor Hidden Services by moving configuration to application.rb
* Instead of setting always_write_cookie at boot, monkey-patch ActionDispatch
2021-02-11 23:47:05 +01:00
chandrn7
160154d798
Fixed issue with .env.vagrant not setting RAILS_ENV variable ( #15709 )
...
* Fixed issue with .env.vagrant not setting RAILS_ENV variable
* made change to fix RAILS_ENV issue in Vagrantfile instead of .env.vagrant
2021-02-11 22:58:39 +01:00
kaias1jp
7004e88738
Fixed WebUI crash when a status opened in the media modal is deleted ( #15701 )
...
* Fixed picture in picture compatibility error in WebUI when status is deleted
* Revert "Fixed picture in picture compatibility error in WebUI when status is deleted"
This reverts commit f003b7d9d88688e9504f7dfae1545d7522fcfd98.
* Close the modal display of the image when status is deleted
* Fixed the case statement before the default statement
* Removed unnecessary parts
2021-02-11 19:59:47 +01:00
