f2b376e9d8
Merge pull request #1632 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-13 10:41:25 +01:00
2cda8be805
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-13 09:40:13 +01:00
ef8deb0878
Fix OpenGraph/LinkedData embeds having incorrectly-generated iframes ( #16978 )
2021-11-13 03:30:27 +01:00
8b8d58c670
Rename, move, fix code
2021-11-12 19:51:35 +01:00
3238e60823
Fix admin sidebar on Mobile layout
2021-11-12 19:51:35 +01:00
f33878969a
Fix some glitch-soc styling issues due to different class names
...
Partial fix to #1629
2021-11-12 16:29:36 +01:00
e510302a7c
Build container image by GitHub Actions ( #16973 )
...
* Build container image by GitHub Actions
* Trigger docker build only pushed to main branch
* Tweak tagging imgae
- "edge" is the main branch
- "latest" is the tagged latest release
2021-11-12 05:18:29 +01:00
18b885ee3a
Fix "bundle exec rails mastodon:setup" crashing in some circumstances ( #16976 )
...
Fix regression from #16896
2021-11-11 14:00:30 +01:00
1114935e64
[CircleCI] Test using Postgres 14 ( #16948 )
...
* Update config.yml
* Update config.yml
2021-11-06 17:13:51 +01:00
2251db42ec
Forward port version bumps to 3.4.2 and 3.4.3 ( #16945 )
...
* Bump version to 3.4.2
* Bump version to 3.4.3
2021-11-06 05:32:14 +01:00
a25839340e
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-06 00:33:55 +01:00
4bb6b1a1e7
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-06 00:15:38 +01:00
6da135a493
Fix reviving revoked sessions and invalidating login ( #16943 )
...
Up until now, we have used Devise's Rememberable mechanism to re-log users
after the end of their browser sessions. This mechanism relies on a signed
cookie containing a token. That token was stored on the user's record,
meaning it was shared across all logged in browsers, meaning truly revoking
a browser's ability to auto-log-in involves revoking the token itself, and
revoking access from *all* logged-in browsers.
We had a session mechanism that dynamically checks whether a user's session
has been disabled, and would log out the user if so. However, this would only
clear a session being actively used, and a new one could be respawned with
the `remember_user_token` cookie.
In practice, this caused two issues:
- sessions could be revived after being closed from /auth/edit (security issue)
- auto-log-in would be disabled for *all* browsers after logging out from one
of them
This PR removes the `remember_token` mechanism and treats the `_session_id`
cookie/token as a browser-specific `remember_token`, fixing both issues.
2021-11-06 00:13:58 +01:00
87085a5152
Fix AccountNote not having a maximum length ( #16942 )
2021-11-06 00:12:25 +01:00
39cdf61ab7
Add support for structured data and more OpenGraph tags to link cards ( #16938 )
...
Save preview cards under their canonical URL
Increase max redirects to follow from 2 to 3
2021-11-05 23:23:05 +01:00
989c67d29d
Fix handling announcements with links ( #16941 )
...
Broken since #15827
2021-11-05 21:14:35 +01:00
458830ee7c
Fix statuses order in account's statuses admin page ( #16937 )
2021-11-04 15:49:35 +01:00
afb2b19ff5
Bump @babel/preset-env from 7.15.8 to 7.16.0 ( #16923 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.15.8 to 7.16.0.
- [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.16.0/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
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-11-02 22:15:45 +09:00
47243e9815
Bump @babel/preset-react from 7.14.5 to 7.16.0 ( #16926 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.14.5 to 7.16.0.
- [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.16.0/packages/babel-preset-react )
---
updated-dependencies:
- dependency-name: "@babel/preset-react"
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-11-02 21:57:45 +09:00
547642fc36
Bump @babel/plugin-proposal-decorators from 7.15.8 to 7.16.0 ( #16924 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.15.8 to 7.16.0.
- [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.16.0/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
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-11-02 21:52:51 +09:00
59415607e0
Bump @babel/plugin-transform-runtime from 7.15.8 to 7.16.0 ( #16927 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.15.8 to 7.16.0.
- [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.16.0/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
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-11-02 21:39:29 +09:00
31c8f8837c
Bump reselect from 4.0.0 to 4.1.1 ( #16931 )
...
Bumps [reselect](https://github.com/reduxjs/reselect ) from 4.0.0 to 4.1.1.
- [Release notes](https://github.com/reduxjs/reselect/releases )
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/reselect/compare/v4.0.0...v4.1.1 )
---
updated-dependencies:
- dependency-name: reselect
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-11-02 21:30:11 +09:00
89b1f76124
Bump sass from 1.43.3 to 1.43.4 ( #16922 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.43.3 to 1.43.4.
- [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.43.3...1.43.4 )
---
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>
2021-11-02 21:27:13 +09:00
75b79b9619
Bump redux-thunk from 2.3.0 to 2.4.0 ( #16932 )
...
Bumps [redux-thunk](https://github.com/reduxjs/redux-thunk ) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/reduxjs/redux-thunk/releases )
- [Commits](https://github.com/reduxjs/redux-thunk/compare/v2.3.0...v2.4.0 )
---
updated-dependencies:
- dependency-name: redux-thunk
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-11-02 21:26:55 +09:00
6305090341
Bump redux from 4.1.1 to 4.1.2 ( #16928 )
...
Bumps [redux](https://github.com/reduxjs/redux ) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/reduxjs/redux/releases )
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/redux/compare/v4.1.1...v4.1.2 )
---
updated-dependencies:
- dependency-name: redux
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-11-02 21:26:31 +09:00
bb08297c99
Bump brakeman from 5.1.1 to 5.1.2 ( #16920 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.1.1...v5.1.2 )
---
updated-dependencies:
- dependency-name: brakeman
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-11-02 21:25:57 +09:00
f604f63fa2
Bump @babel/runtime from 7.15.4 to 7.16.0 ( #16930 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.15.4 to 7.16.0.
- [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.16.0/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
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-11-02 21:23:00 +09:00
83c77f9840
Bump @babel/plugin-transform-react-inline-elements from 7.14.5 to 7.16.0 ( #16929 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.14.5 to 7.16.0.
- [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.16.0/packages/babel-plugin-transform-react-inline-elements )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
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-11-02 21:22:46 +09:00
e153e79730
Bump @babel/core from 7.15.8 to 7.16.0 ( #16925 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.15.8 to 7.16.0.
- [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.16.0/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
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-11-02 21:22:01 +09:00
884c60002e
Skip blocked domains media on tootctl media refresh ( #16914 )
2021-10-28 19:30:44 +02:00
7ccbfb55dd
ran `yarn manage:translations en` ( #16912 )
2021-10-28 05:29:49 +02:00
860218b832
Bump rubocop from 1.22.1 to 1.22.3 ( #16913 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.22.1 to 1.22.3.
- [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.22.1...v1.22.3 )
---
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>
2021-10-28 10:44:57 +09:00
e53120eb79
Bump babel-loader from 8.2.2 to 8.2.3 ( #16906 )
...
Bumps [babel-loader](https://github.com/babel/babel-loader ) from 8.2.2 to 8.2.3.
- [Release notes](https://github.com/babel/babel-loader/releases )
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel-loader/compare/v8.2.2...v8.2.3 )
---
updated-dependencies:
- dependency-name: babel-loader
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-10-28 10:44:28 +09:00
f4a190e848
Bump react-redux from 7.2.5 to 7.2.6 ( #16904 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.2.5 to 7.2.6.
- [Release notes](https://github.com/reduxjs/react-redux/releases )
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.5...v7.2.6 )
---
updated-dependencies:
- dependency-name: react-redux
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-10-28 10:27:32 +09:00
57acd6210e
Bump eslint-plugin-promise from 5.1.0 to 5.1.1 ( #16905 )
...
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise ) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases )
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/development/CHANGELOG.md )
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits )
---
updated-dependencies:
- dependency-name: eslint-plugin-promise
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-10-28 10:26:58 +09:00
b712ec20a3
Bump tzinfo-data from 1.2021.4 to 1.2021.5 ( #16903 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2021.4 to 1.2021.5.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2021.4...v1.2021.5 )
---
updated-dependencies:
- dependency-name: tzinfo-data
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-10-28 10:25:12 +09:00
8946b49ef2
Bump sass from 1.43.2 to 1.43.3 ( #16902 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.43.2 to 1.43.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.43.2...1.43.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>
2021-10-28 10:24:57 +09:00
2801b5409b
Bump axios from 0.23.0 to 0.24.0 ( #16901 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v0.24.0 )
---
updated-dependencies:
- dependency-name: axios
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-10-28 10:24:21 +09:00
a9f4aae4e7
Bump rubocop from 1.22.1 to 1.22.2 ( #16900 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.22.1 to 1.22.2.
- [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.22.1...v1.22.2 )
---
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>
2021-10-28 10:21:17 +09:00
e8f58beeea
Bump aws-sdk-s3 from 1.103.0 to 1.104.0 ( #16899 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.103.0 to 1.104.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
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-10-28 10:20:43 +09:00
cdcc4523a5
Bump capybara from 3.35.3 to 3.36.0 ( #16898 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.35.3 to 3.36.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.35.3...3.36.0 )
---
updated-dependencies:
- dependency-name: capybara
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-10-28 10:20:19 +09:00
e0f3962697
Merge pull request #1625 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-10-25 21:31:10 +02:00
a30ac454b2
[Glitch] Split context for filter bar and unread markers
...
Port 11d4f9eefc
2021-10-25 20:37:07 +02:00
dbbb077c19
[Glitch] Enhance dashboard styles
...
Port b58d32cfe2
2021-10-25 20:36:31 +02:00
e855df149b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added new configuration options, uncommented by default.
Commented them.
- `Gemfile.lock`:
Upstream updated dependencies textually close to glitch-soc-specific
dependencies.
Updated those upstream dependencies.
2021-10-25 20:28:51 +02:00
c647fa99ca
Merge pull request #1624 from atsu1125/glitch-translate
...
translation glitch's web interface [ja]
2021-10-25 20:24:23 +02:00
5ba46952af
Fix mastodon:setup to take dotenv/docker-compose differences into account ( #16896 )
...
In order to work around https://github.com/mastodon/mastodon/issues/16895 ,
add a warning to .env.production.sample, and change the mastodon:setup rake
task to:
- output a warning if a variable will be interpreted differently by dotenv
and docker-compose
- ensure the printed config is compatible with docker-compose
2021-10-25 16:34:15 +02:00
11d4f9eefc
Split context for filter bar and unread markers ( #16865 )
...
On notifications page, in settings, "Show" for quick filter bar and
unread notifications markers use the same string, while being placed in
the separate contexts - under different settings categories.
This commit splits the contexts, creating new strings:
- "Show filter bar" in place of "Show" for filter bar;
- "Highlight unread notifications" in place of "Show" for unread
notification markers, which are now simply called "Highlighting";
- There's also "Unread notifications" in place of "Unread notification
markers" string to accompany the changes to "Show" string under that
category.
All new strings have new IDs, which will cause previous strings to
invalidate on the next translation update and new strings to be created.
This will help Mastodon translators to know that there are changes and
improve translation in accordance to the source string update.
2021-10-25 16:32:28 +02:00
a9ff5c8309
templates/systemd/mastodon: update sandbox mode ( #16235 )
...
* templates/systemd/mastodon: add new sandboxing options
* templates/systemd/mastodon: add '@privileged' and remove duplicates SystemCallFilters
* templates/systemd/mastodon: add '@ipc' SystemCallFilter
* templates/systemd/mastodon: add '@memlock' SystemCallFilter
* templates/systemd/mastodon: allow '@resources' filter to mastodon-web service
2021-10-25 16:31:20 +02:00
c8ce728705
Support authentication for ElasticSearch ( #16890 )
...
* Support authentication for ElasticSearch
* Fix chewy auth settings
2021-10-24 17:20:03 +02:00
Claire