Shlee
8c241c1e0b
Fix for #18637 - Migrate from elasticsearch-oss to elasticsearch basic ( #18643 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2022-06-15 16:35:36 +02:00
Shlee
cc7cebb79a
Fix for #18637 - Migrate from elasticsearch-oss to elasticsearch basic ( #18643 )
...
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
2022-06-15 16:35:36 +02:00
dependabot[bot]
756b0eeb0d
Bump oj from 3.13.13 to 3.13.14 ( #18615 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.13 to 3.13.14.
- [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.13...v3.13.14 )
---
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>
2022-06-15 14:53:49 +09:00
dependabot[bot]
af9d7a208a
Bump oj from 3.13.13 to 3.13.14 ( #18615 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.13 to 3.13.14.
- [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.13...v3.13.14 )
---
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>
2022-06-15 14:53:49 +09:00
dependabot[bot]
2501e0afaf
Bump sass from 1.52.2 to 1.52.3 ( #18645 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.52.2 to 1.52.3.
- [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.52.2...1.52.3 )
---
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>
2022-06-15 14:53:20 +09:00
dependabot[bot]
152a4dc681
Bump sass from 1.52.2 to 1.52.3 ( #18645 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.52.2 to 1.52.3.
- [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.52.2...1.52.3 )
---
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>
2022-06-15 14:53:20 +09:00
dependabot[bot]
8aeedfd1ae
Bump sidekiq-unique-jobs from 7.1.23 to 7.1.24 ( #18651 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.23 to 7.1.24.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.23...v7.1.24 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
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>
2022-06-15 14:52:21 +09:00
dependabot[bot]
6427e039b7
Bump sidekiq-unique-jobs from 7.1.23 to 7.1.24 ( #18651 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.23 to 7.1.24.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.23...v7.1.24 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
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>
2022-06-15 14:52:21 +09:00
dependabot[bot]
7a7c882b48
Bump @babel/core from 7.18.2 to 7.18.5 ( #18650 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.18.2 to 7.18.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.18.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>
2022-06-15 14:51:48 +09:00
dependabot[bot]
ea2640e76f
Bump @babel/core from 7.18.2 to 7.18.5 ( #18650 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.18.2 to 7.18.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.18.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>
2022-06-15 14:51:48 +09:00
Claire
ea6c11a91a
Merge pull request #1798 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-06-13 10:36:04 +02:00
Claire
800e87ae91
Merge pull request #1798 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-06-13 10:36:04 +02:00
Ariadne Conill
bea1eda5f7
th: fixup!
2022-06-12 01:07:56 +00:00
Ariadne Conill
6849927767
th: glitch: fixup!
2022-06-12 01:07:52 +00:00
Eugen Rochko
9f8a97a5be
Remove item titles from RSS feeds ( #18640 )
2022-06-12 02:48:03 +02:00
Eugen Rochko
620b70c41e
Remove item titles from RSS feeds ( #18640 )
2022-06-12 02:48:03 +02:00
Ariadne Conill
1d2c568d63
th: vanilla: emoji: use 63x63 grid for emoji
2022-06-12 00:45:41 +00:00
Ariadne Conill
ee5cb42cc9
th: glitch: emoji: set sprite sheet to 63x63
2022-06-12 00:43:28 +00:00
Ariadne Conill
cbe1201b51
th: dockerfile: implement emoji-mart patch
2022-06-11 23:57:03 +00:00
Ariadne Conill
ed992cd7d5
th: update emoji-mart sprite sheet for emoji 13.1
2022-06-11 23:52:40 +00:00
Ariadne Conill
55ca9b7ae0
th: add emoji 13.1 data for emoji-mart
2022-06-11 23:51:31 +00:00
Eugen Rochko
c3f7041715
Fix wrong aspect ratio of logo in icons ( #18639 )
2022-06-11 20:32:02 +02:00
Eugen Rochko
fe2d6fe105
Fix wrong aspect ratio of logo in icons ( #18639 )
2022-06-11 20:32:02 +02:00
Markus Petzsch
8d63796f91
chore: bump elasticsearch version in docker-compose.yml file; closes #18189 ( #18637 )
2022-06-11 15:34:58 +02:00
Markus Petzsch
e3cebfa457
chore: bump elasticsearch version in docker-compose.yml file; closes #18189 ( #18637 )
2022-06-11 15:34:58 +02:00
dependabot[bot]
5fdfc2e703
Bump sass from 1.52.1 to 1.52.2 ( #18616 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.52.1 to 1.52.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.52.1...1.52.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>
2022-06-11 21:55:17 +09:00
dependabot[bot]
32c83d76a0
Bump sass from 1.52.1 to 1.52.2 ( #18616 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.52.1 to 1.52.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.52.1...1.52.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>
2022-06-11 21:55:17 +09:00
dependabot[bot]
323f1c24ad
Bump bootsnap from 1.11.1 to 1.12.0 ( #18575 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.11.1 to 1.12.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.11.1...v1.12.0 )
---
updated-dependencies:
- dependency-name: bootsnap
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>
2022-06-11 21:54:45 +09:00
dependabot[bot]
2d818d9c97
Bump bootsnap from 1.11.1 to 1.12.0 ( #18575 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.11.1 to 1.12.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.11.1...v1.12.0 )
---
updated-dependencies:
- dependency-name: bootsnap
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>
2022-06-11 21:54:45 +09:00
dependabot[bot]
e5709d1664
Bump rubocop from 1.30.0 to 1.30.1 ( #18613 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.30.0 to 1.30.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.30.0...v1.30.1 )
---
updated-dependencies:
- dependency-name: rubocop
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>
2022-06-11 21:53:52 +09:00
dependabot[bot]
f88d1db904
Bump rubocop from 1.30.0 to 1.30.1 ( #18613 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.30.0 to 1.30.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.30.0...v1.30.1 )
---
updated-dependencies:
- dependency-name: rubocop
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>
2022-06-11 21:53:52 +09:00
Claire
bfe05eb101
[Glitch] Fix logo gradient not working on some Safari and Blink-based browsers
...
Port 28dc3750f6
2022-06-11 00:09:20 +02:00
Claire
f938afee72
[Glitch] Fix logo gradient not working on some Safari and Blink-based browsers
...
Port 37cd984acf
2022-06-11 00:09:20 +02:00
Eugen Rochko
c3c77fc5d9
[Glitch] Change brand color and logotypes
...
Port SCSS changes from 03d2cb5146
2022-06-11 00:09:20 +02:00
Eugen Rochko
b31c32fd61
[Glitch] Change brand color and logotypes
...
Port SCSS changes from 45aa5781ce
2022-06-11 00:09:20 +02:00
Claire
03846ad6c2
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
2022-06-11 00:08:41 +02:00
Claire
15929a3d59
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
2022-06-11 00:08:41 +02:00
Claire
d60b012e7b
Merge pull request #1797 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-06-10 19:19:31 +02:00
Claire
970f06331b
Merge pull request #1797 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-06-10 19:19:31 +02:00
Thomas Citharel
7f29a2ac90
Typo in path to mastodon logo in README.md ( #18632 )
...
Less ass, more assets.
2022-06-10 17:37:25 +02:00
Thomas Citharel
f09a66b9a7
Typo in path to mastodon logo in README.md ( #18632 )
...
Less ass, more assets.
2022-06-10 17:37:25 +02:00
Claire
28dc3750f6
Fix logo gradient not working on some Safari and Blink-based browsers ( #18634 )
...
Works around https://bugs.chromium.org/p/chromium/issues/detail?id=258029
2022-06-10 17:34:59 +02:00
Claire
37cd984acf
Fix logo gradient not working on some Safari and Blink-based browsers ( #18634 )
...
Works around https://bugs.chromium.org/p/chromium/issues/detail?id=258029
2022-06-10 17:34:59 +02:00
Eugen Rochko
18fbdcd5f4
[Glitch] Add administrative webhooks
...
Port SCSS changes from 0eb2db6b52
2022-06-10 17:04:02 +02:00
Eugen Rochko
d064476c4a
[Glitch] Add administrative webhooks
...
Port SCSS changes from a2871cd747
2022-06-10 17:04:02 +02:00
Claire
3b4abfe132
Merge branch 'main' into glitch-soc/merge-upstream
2022-06-10 11:51:43 +02:00
Claire
edaaf6a5e9
Merge branch 'main' into glitch-soc/merge-upstream
2022-06-10 11:51:43 +02:00
Eugen Rochko
03d2cb5146
Change brand color and logotypes ( #18592 )
...
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
2022-06-09 22:25:23 +02:00
Eugen Rochko
45aa5781ce
Change brand color and logotypes ( #18592 )
...
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
2022-06-09 22:25:23 +02:00
Eugen Rochko
0eb2db6b52
Add administrative webhooks ( #18510 )
...
* Add administrative webhooks
* Fix error when webhook is deleted before delivery worker runs
2022-06-09 21:57:36 +02:00
