1e2097afd4
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-02 16:12:11 +02:00
38b3419950
Fix not being able to suspend accounts that already have a canonical e-mail block ( #16455 )
2021-07-02 12:03:15 +02:00
92c8c30e17
Bump ws from 7.5.0 to 7.5.1 ( #16452 )
...
Bumps [ws](https://github.com/websockets/ws ) from 7.5.0 to 7.5.1.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.5.0...7.5.1 )
---
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>
2021-07-01 02:19:30 +09:00
01de07c91a
Bump rubocop from 1.17.0 to 1.18.1 ( #16451 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.17.0 to 1.18.1.
- [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.17.0...v1.18.1 )
---
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>
2021-07-01 01:59:58 +09:00
3460df6fe3
Bump sidekiq-unique-jobs from 7.0.12 to 7.1.1 ( #16450 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.12 to 7.1.1.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.12...v7.1.1 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
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>
2021-07-01 00:45:49 +09:00
78acea283d
Bump babel-jest from 27.0.2 to 27.0.6 ( #16441 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.0.2 to 27.0.6.
- [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/v27.0.6/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
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>
2021-06-30 23:41:10 +09:00
6f533710e0
Bump rubocop-rails from 2.11.0 to 2.11.1 ( #16439 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.11.0 to 2.11.1.
- [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.0...v2.11.1 )
---
updated-dependencies:
- dependency-name: rubocop-rails
dependency-type: direct:development
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>
2021-06-30 23:40:07 +09:00
90413598a3
Bump @babel/preset-env from 7.14.5 to 7.14.7 ( #16443 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.14.5 to 7.14.7.
- [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.14.7/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>
2021-06-30 23:37:32 +09:00
c5f8c78a07
Bump mini-css-extract-plugin from 1.6.0 to 1.6.2 ( #16444 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.6.0 to 1.6.2.
- [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.6.0...v1.6.2 )
---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
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>
2021-06-30 23:37:01 +09:00
b983fdca54
Bump oj from 3.11.6 to 3.11.7 ( #16437 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.6 to 3.11.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.11.6...v3.11.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>
2021-06-30 23:36:36 +09:00
f4b9d94ce7
Merge pull request #1559 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-30 11:13:38 +02:00
81d8a20a88
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-30 09:43:18 +02:00
653c925beb
Fix missing on_delete: :cascade for canonical_email_blocks foreign key ( #16448 )
2021-06-30 06:13:55 +02:00
a4c828f8e7
Merge pull request #1558 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-30 01:01:43 +02:00
ba8f4535e3
[Glitch] Hide /about/more footer link in limited federation mode
...
Port 7c27ccb8d8
2021-06-30 00:45:00 +02:00
d1780fb9a4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Removed upstream, while we had a checkbox telling people to check if the
issue was present upstream. Removed the file as well.
2021-06-30 00:42:52 +02:00
7c27ccb8d8
Fix #16407 ( #16432 )
2021-06-27 22:31:28 +02:00
04a552f076
Replace to issue form ( #16429 )
2021-06-25 15:01:52 +02:00
ff3626269e
Merge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-25 12:20:46 +02:00
a993ff6e2f
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-25 10:44:06 +02:00
9e5a1daa9b
Fix styling of boost button in media modal not reflecting ability to boost ( #16387 )
2021-06-25 04:45:30 +02:00
e592e47e19
Fix WebUI crash when a toot with a playing video gets deleted ( #16384 )
...
* Fix WebUI crash when a toot with a playing video gets deleted
* Fix pop-up player not closing the moment a status is deleted
2021-06-25 04:45:17 +02:00
07ff8cb019
Fix compression-webpack-plugin configuration ( #16356 )
...
compression-webpack-plugin 6.0.0 has changed how filenames were generated,
so from #14892 onward (Mastodon v3.3.0 and later), compressed files were
output to a file named `.gz` instead of the correct filenames.
2021-06-25 04:45:04 +02:00
0eebade48c
Merge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-24 19:22:13 +02:00
83b4e8584b
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-24 18:59:19 +02:00
9cd724a3b4
Bump rubocop from 1.16.1 to 1.17.0 ( #16424 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.16.1 to 1.17.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.16.1...v1.17.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>
2021-06-25 00:55:34 +09:00
afc170a231
Bump rubocop-rails from 2.10.1 to 2.11.0 ( #16419 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.10.1 to 2.11.0.
- [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.10.1...v2.11.0 )
---
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>
2021-06-24 23:57:03 +09:00
05a62819c7
Bump bindata from 2.4.8 to 2.4.10 ( #16430 )
...
Bumps [bindata](https://github.com/dmendel/bindata ) from 2.4.8 to 2.4.10.
- [Release notes](https://github.com/dmendel/bindata/releases )
- [Changelog](https://github.com/dmendel/bindata/blob/master/ChangeLog.rdoc )
- [Commits](https://github.com/dmendel/bindata/compare/v2.4.8...v2.4.10 )
---
updated-dependencies:
- dependency-name: bindata
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24 23:56:43 +09:00
62bf929684
Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crash
...
[Glitch] Fix WebUI crash when a toot with a playing video gets deleted
2021-06-24 16:00:26 +02:00
b6f952ec5b
[Glitch] Fix styling of boost button in media modal not reflecting ability to boost
...
Port tootsuite#16387 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:43:04 +02:00
f024f523b2
Fix pop-up player not closing the moment a status is deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:18 +02:00
036ec18fb3
Fix WebUI crash when a toot with a playing video gets deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:12 +02:00
2a4e44a725
Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-24 15:16:38 +02:00
86aca08ec6
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-24 08:08:02 +02:00
a6f03e179a
Bump @babel/runtime from 7.14.5 to 7.14.6 ( #16423 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.14.5 to 7.14.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.14.6/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>
2021-06-24 07:50:13 +09:00
e724a3ea64
Bump eslint from 7.28.0 to 7.29.0 ( #16422 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.28.0 to 7.29.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.28.0...v7.29.0 )
---
updated-dependencies:
- dependency-name: eslint
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>
2021-06-24 07:49:56 +09:00
aab731e926
Bump oj from 3.11.5 to 3.11.6 ( #16421 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.5 to 3.11.6.
- [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.11.5...v3.11.6 )
---
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>
2021-06-24 07:49:40 +09:00
f2a1cf7af9
Bump sass from 1.34.1 to 1.35.1 ( #16420 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.34.1 to 1.35.1.
- [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.34.1...1.35.1 )
---
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>
2021-06-24 07:49:29 +09:00
31ec06bcf9
Bump @babel/core from 7.14.5 to 7.14.6 ( #16425 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.14.5 to 7.14.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.14.6/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>
2021-06-24 07:48:37 +09:00
50ce660277
Bump ws from 7.4.6 to 7.5.0 ( #16426 )
...
Bumps [ws](https://github.com/websockets/ws ) from 7.4.6 to 7.5.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.4.6...7.5.0 )
---
updated-dependencies:
- dependency-name: ws
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>
2021-06-24 07:47:47 +09:00
1c21dcfa35
Fix newlines in accout notes added by the Move handler ( #16415 )
...
* Fix newlines in account notes added by the move handler
* Make MoveWorker more robust
2021-06-23 23:55:47 +02:00
262c7bcb57
Add full user agent in tooltips for login activities ( #16428 )
...
Also adds timestamp in HTML itself to not rely on javascript
2021-06-23 16:42:23 +02:00
776e00f193
Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-06-23 12:49:09 +02:00
979059fbc9
Fix login date not showing up in login history by using “public” pack
2021-06-23 12:21:40 +02:00
d10d1e5eac
[Glitch] Add authentication history
...
Port SCSS changes from d174d12c83
2021-06-23 11:40:18 +02:00
37fd9670a5
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-23 10:46:24 +02:00
63b807cffc
Fix serialization of followers/following counts when user hides their network ( #16418 )
...
* Add tests
* Fix serialization of followers/following counts when user hides their network
Fixes #16382
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-21 20:14:47 +02:00
d174d12c83
Add authentication history ( #16408 )
2021-06-21 17:07:30 +02:00
946200b471
Bump @babel/plugin-proposal-decorators from 7.14.2 to 7.14.5 ( #16401 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.14.2 to 7.14.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.14.5/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
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>
2021-06-18 17:25:20 +09:00
8da9afd60f
Bump @babel/plugin-transform-runtime from 7.14.3 to 7.14.5 ( #16394 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.14.3 to 7.14.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.14.5/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-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>
2021-06-18 16:54:24 +09:00
Claire