tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
13,528 Commits 20 Branches 113 Tags 222 MiB
15efa32cca
Commit Graph

13528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
5f4c0b79c2
Change ResolveAccountService's handling of skip_webfinger (#15750) 
* Change ResolveAccountService's handling of skip_webfinger

Change it so it never makes any webfinger query, as the name would imply.

* Add tests

* Change FollowService to not take an URI for target_account

* Restore domain-block check in FollowService

* Fix tests
 2021-02-24 06:32:13 +01:00
dependabot[bot]
eb83ab45e2
Bump doorkeeper from 5.4.0 to 5.5.0 (#15757) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.4.0...v5.5.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-24 06:58:39 +09:00
dependabot[bot]
2fed2b5d91
Bump array-includes from 3.1.2 to 3.1.3 (#15773) 
Bumps [array-includes](https://github.com/es-shims/array-includes) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/es-shims/array-includes/releases)
- [Changelog](https://github.com/es-shims/array-includes/blob/main/CHANGELOG.md)
- [Commits](https://github.com/es-shims/array-includes/compare/v3.1.2...v3.1.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-24 06:57:36 +09:00
dependabot[bot]
684dcd6ab0
Bump lodash from 4.17.20 to 4.17.21 (#15774) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-24 06:56:29 +09:00
Claire
4aa860b65b
Merge pull request #1501 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-02-22 19:36:03 +01:00
Claire
1b50ac08c1
Fix server rules not being displayed if extended server discription isn't set (#15778) 2021-02-22 18:26:24 +01:00
abcang
6ae04d990c [Glitch] Fix default searchTokens 
Port 2127f40e6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-22 15:47:17 +01:00
Eugen Rochko
24fb5d7572 [Glitch] Add server rules 
Port SCSS changes from 8331fdf7e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-22 15:45:28 +01:00
Claire
679642e26c Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
abcang
2127f40e6b
Fix default searchTokens (#15775) 2021-02-22 11:26:08 +01:00
Eugen Rochko
8331fdf7e0
Add server rules (#15769) 2021-02-21 19:50:12 +01:00
dependabot[bot]
dcc7c686f3
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]
76e5906cad
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]
215a0e3b9f
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]
cfc1771484
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]
53804ac23e
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]
8aff02ef54
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]
153aa8f329
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]
6993debbe2
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]
03d5dba7c8
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]
68d1a4ee0c
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]
85324837ea
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]
fd2cd8c278
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]
ffc5398f91
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]
455447ef7c
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
a457a26b2d
dockerignore helm chart (#15747) 2021-02-19 09:57:03 +01:00
Alex Dunn
38a6ae2d07
helm: pin versions, commit lockfile (#15749) 2021-02-19 09:56:40 +01:00
Justin Tracey
c9e8e1739c
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
fc145de238
Update .deepsource.toml (#15753) 2021-02-19 09:53:25 +01:00
Shlee
ab9c2ed98d
Delete pagination.rb (#15754) 2021-02-19 09:52:58 +01:00
Alex Dunn
fca4fd1daa
helm: add support for S3 storage (#15748) 2021-02-19 09:52: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
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
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
55a6b54f8e
helm: add option for external db (#15722) 2021-02-14 20:16:32 +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
8792128f38
Merge pull request #1500 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-02-12 14:02:24 +01: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
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
9213b02656 Refactor privacy dropdown to have an interface closer to upstream's 2021-02-12 12:04:04 +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
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
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
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
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
15ced8728f
Refactor Api::Web::SettingsController (#15717) 2021-02-12 07:19:15 +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]
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]
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]
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