Eugen Rochko
e4ba5635ee
Add GET /api/v1/accounts/lookup
REST API ( #15740 )
2021-02-16 15:28:32 +01:00
Eugen Rochko
e31ed27485
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
Justin Tracey
3f8523130d
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
9c273c2a59
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
Alex Dunn
55a6b54f8e
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
Cecylia Bocovich
3447bd2f80
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
Claire
8792128f38
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
dependabot[bot]
5aa66fccb5
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 12:31:49 +01:00
Claire
49eef466b8
[Glitch] Add dropdown for boost privacy in boost confirmation modal
...
Port 07b46cb332
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
Claire
9213b02656
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:58:34 +01:00
kaias1jp
847779b1e4
[Glitch] Fixed WebUI crash when a status opened in the media modal is deleted
...
Port 08ae116dc6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:58:34 +01:00
Jeong Arm
77f7de53e1
[Glitch] Use custom mascot on static share page
...
Port b2572f0b29
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:57:09 +01:00
Jeong Arm
8f24f7626a
[Glitch] Use custom mascot on static share page
...
Port d499bb031f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:55:37 +01:00
Mélanie Chauvel
0e7484209c
[Glitch] Slightly reorder three dots menu on toots to make it more intuitive
...
Port f5fefdc11a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:55:37 +01:00
Eugen Rochko
d66867d1c2
[Glitch] Change max. image dimensions to 1920x1080px (1080p)
...
Port 826a5cc624
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12 10:46:00 +01:00
Eugen Rochko
28f533f370
[Glitch] Change max. image dimensions to 1920x1080px (1080p)
...
Port acf1842896
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
Claire
5e11f3a6e1
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
15ced8728f
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
Eugen Rochko
f8972d4503
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]
de0664de2c
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]
fa99fde549
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]
37e6bad6c4
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]
72df464fb8
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
dependabot[bot]
928bbf7e9a
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
Claire
21fb3f3684
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
chandrn7
eb23f98592
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
kaias1jp
08ae116dc6
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
Claire
649b483c64
Downgrade bootsnap to 1.6.0 ( #15711 )
...
* Revert "Bump bootsnap from 1.5.1 to 1.7.1 (#15669 )"
This reverts commit 3a425520d1
.
* Downgrade bootsnap to 1.6.0
2021-02-11 19:20:58 +01:00
Claire
01e44b886d
Downgrade bootsnap to 1.6.0 ( #15711 )
...
* Revert "Bump bootsnap from 1.5.1 to 1.7.1 (#15669 )"
This reverts commit c3d1b7a2f5
.
* Downgrade bootsnap to 1.6.0
2021-02-11 19:20:58 +01:00