about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-05-13Merge pull request #1327 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-05-13[Glitch] Change “hide/show boosts from …” menu to be hidden when the ↵ThibG
account is muted Port 92f85bea528c5eca97a2f075c53f7dcafdf5cb41 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13[Glitch] Fix some account avatars on public pages having incorrect sizeThibG
Port 48503384d00525fe61a038bdb8a55868fdc1db92 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13[Glitch] Fix first poll option not being focused when adding a pollThibG
Port af6d35627978047724612c027e60cb0a89cb2eef to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-05-13Change “hide/show boosts from …” menu to be hidden when the account is ↵ThibG
muted (#13748) Otherwise, it may mislead users into believing this setting is an exception to the muting behavior. Fixes #13744
2020-05-13Fix some account avatars on public pages having incorrect size (#13692)ThibG
* Fix some account avatars on public pages having incorrect size * Remove outdated and overridden width and height attributes * Remove more hardcoded width/height attributes
2020-05-12Clarified "missing_also_known_as" (#13746)TheMainOne
Fixes the confusion mentioned in https://github.com/tootsuite/mastodon/issues/12216. Suggestion of this fix provided by https://github.com/tootsuite/mastodon/issues/12216#issuecomment-564918757.
2020-05-12Fix RedownloadMediaWorker (#13741)Takeshi Umeda
2020-05-12Fix first poll option not being focused when adding a poll (#13740)ThibG
Fixes #13698
2020-05-12Fix keybase config serializer (#13742)Takeshi Umeda
2020-05-12Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)dependabot-preview[bot]
* Bump doorkeeper from 5.3.3 to 5.4.0 Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.3 to 5.4.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.3.3...v5.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix tests * Fix use of Doorkeeper::AccessToken.find_or_create_for * Fix tests? Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-05-12Fix not publishing update of remote timeline (#13745)Takeshi Umeda
* Fix not publishing update of remote timeline * fix @ missing * if/unless to if/else
2020-05-12Bump terser-webpack-plugin from 2.3.5 to 3.0.1 (#13716)dependabot-preview[bot]
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 2.3.5 to 3.0.1. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.3.5...v3.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump jest-jasmine2 from 25.4.0 to 25.5.4 (#13704)dependabot-preview[bot]
Bumps [jest-jasmine2](https://github.com/facebook/jest/tree/HEAD/packages/jest-jasmine2) from 25.4.0 to 25.5.4. - [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/v25.5.4/packages/jest-jasmine2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump webpack from 4.42.1 to 4.43.0 (#13717)dependabot-preview[bot]
Bumps [webpack](https://github.com/webpack/webpack) from 4.42.1 to 4.43.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.42.1...v4.43.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump fsevents from 1.2.12 to 1.2.13 (#13715)dependabot-preview[bot]
Bumps [fsevents](https://github.com/fsevents/fsevents) from 1.2.12 to 1.2.13. - [Release notes](https://github.com/fsevents/fsevents/releases) - [Commits](https://github.com/fsevents/fsevents/compare/1.2.12...v1.2.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump @rails/ujs from 6.0.2 to 6.0.3 (#13730)dependabot-preview[bot]
Bumps [@rails/ujs](https://github.com/rails/rails) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.0.2...v6.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump terser from 4.4.3 to 4.6.13 (#13723)dependabot-preview[bot]
Bumps [terser](https://github.com/terser/terser) from 4.4.3 to 4.6.13. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/compare/v4.4.3...v4.6.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump babel-preset-jest from 25.2.1 to 25.5.0 (#13721)dependabot-preview[bot]
Bumps [babel-preset-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-preset-jest) from 25.2.1 to 25.5.0. - [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/v25.5.0/packages/babel-preset-jest) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump jest-worker from 25.1.0 to 25.5.0 (#13720)dependabot-preview[bot]
Bumps [jest-worker](https://github.com/facebook/jest/tree/HEAD/packages/jest-worker) from 25.1.0 to 25.5.0. - [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/v25.5.0/packages/jest-worker) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump spdy from 4.0.1 to 4.0.2 (#13713)dependabot-preview[bot]
Bumps [spdy](https://github.com/indutny/node-spdy) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/indutny/node-spdy/releases) - [Commits](https://github.com/indutny/node-spdy/commits/v4.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump jest-matcher-utils from 25.4.0 to 25.5.0 (#13702)dependabot-preview[bot]
Bumps [jest-matcher-utils](https://github.com/facebook/jest/tree/HEAD/packages/jest-matcher-utils) from 25.4.0 to 25.5.0. - [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/v25.5.0/packages/jest-matcher-utils) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump public_suffix from 4.0.4 to 4.0.5 (#13736)dependabot-preview[bot]
Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/weppos/publicsuffix-ruby/releases) - [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.4...v4.0.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump raabro from 1.1.6 to 1.3.1 (#13738)dependabot-preview[bot]
Bumps [raabro](https://github.com/floraison/raabro) from 1.1.6 to 1.3.1. - [Release notes](https://github.com/floraison/raabro/releases) - [Changelog](https://github.com/floraison/raabro/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/raabro/compare/v1.1.6...v1.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump browser from 4.0.0 to 4.1.0 (#13737)dependabot-preview[bot]
Bumps [browser](https://github.com/fnando/browser) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/fnando/browser/releases) - [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md) - [Commits](https://github.com/fnando/browser/compare/v4.0.0...v4.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump aws-partitions from 1.311.0 to 1.312.0 (#13735)dependabot-preview[bot]
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.311.0 to 1.312.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump strong_migrations from 0.6.5 to 0.6.6 (#13731)dependabot-preview[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.5 to 0.6.6. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.6.5...v0.6.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump rspec-expectations from 3.9.1 to 3.9.2 (#13734)dependabot-preview[bot]
Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/rspec/rspec-expectations/releases) - [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.1...v3.9.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump pastel from 0.7.3 to 0.7.4 (#13732)dependabot-preview[bot]
Bumps [pastel](https://github.com/piotrmurach/pastel) from 0.7.3 to 0.7.4. - [Release notes](https://github.com/piotrmurach/pastel/releases) - [Changelog](https://github.com/piotrmurach/pastel/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/pastel/compare/v0.7.3...v0.7.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump vendors from 1.0.2 to 1.0.4 (#13728)dependabot-preview[bot]
Bumps [vendors](https://github.com/wooorm/vendors) from 1.0.2 to 1.0.4. - [Release notes](https://github.com/wooorm/vendors/releases) - [Commits](https://github.com/wooorm/vendors/compare/1.0.2...1.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-12Bump postcss-modules-scope from 2.1.1 to 2.2.0 (#13727)dependabot-preview[bot]
Bumps [postcss-modules-scope](https://github.com/css-modules/postcss-modules-scope) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/css-modules/postcss-modules-scope/releases) - [Changelog](https://github.com/css-modules/postcss-modules-scope/blob/master/CHANGELOG.md) - [Commits](https://github.com/css-modules/postcss-modules-scope/compare/v2.1.1...v2.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump stylehacks from 4.0.1 to 4.0.3 (#13725)dependabot-preview[bot]
Bumps [stylehacks](https://github.com/cssnano/cssnano) from 4.0.1 to 4.0.3. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/4.0.1...4.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump prompts from 2.0.3 to 2.3.2 (#13712)dependabot-preview[bot]
Bumps [prompts](https://github.com/terkelg/prompts) from 2.0.3 to 2.3.2. - [Release notes](https://github.com/terkelg/prompts/releases) - [Commits](https://github.com/terkelg/prompts/compare/v2.0.3...v2.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump react-dom from 16.13.0 to 16.13.1 (#13711)dependabot-preview[bot]
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.13.0 to 16.13.1. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react-dom) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump @clusterws/cws from 0.17.3 to 2.0.0 (#13709)dependabot-preview[bot]
Bumps [@clusterws/cws](https://github.com/ClusterWS/cWS) from 0.17.3 to 2.0.0. - [Release notes](https://github.com/ClusterWS/cWS/releases) - [Changelog](https://github.com/ClusterWS/cWS/blob/master/CHANGELOG.md) - [Commits](https://github.com/ClusterWS/cWS/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump postcss-calc from 7.0.1 to 7.0.2 (#13707)dependabot-preview[bot]
Bumps [postcss-calc](https://github.com/postcss/postcss-calc) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/postcss/postcss-calc/releases) - [Changelog](https://github.com/postcss/postcss-calc/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss-calc/compare/7.0.1...7.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump react-test-renderer from 16.13.0 to 16.13.1 (#13710)dependabot-preview[bot]
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.13.0 to 16.13.1. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react-test-renderer) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump js-base64 from 2.5.0 to 2.5.2 (#13703)dependabot-preview[bot]
Bumps [js-base64](https://github.com/dankogai/js-base64) from 2.5.0 to 2.5.2. - [Release notes](https://github.com/dankogai/js-base64/releases) - [Commits](https://github.com/dankogai/js-base64/compare/2.5.0...2.5.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump is-buffer from 2.0.3 to 2.0.4 (#13705)dependabot-preview[bot]
Bumps [is-buffer](https://github.com/feross/is-buffer) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/feross/is-buffer/releases) - [Commits](https://github.com/feross/is-buffer/compare/v2.0.3...v2.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Bump jest-runtime from 25.4.0 to 25.5.4 (#13706)dependabot-preview[bot]
Bumps [jest-runtime](https://github.com/facebook/jest/tree/HEAD/packages/jest-runtime) from 25.4.0 to 25.5.4. - [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/v25.5.4/packages/jest-runtime) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-11Fix sr locale being selected over sr-Latn (#13693)ThibG
* Fix sr locale being selected over sr-Latn * Update tests
2020-05-10Reset secret of web app that could have been exposed by Doorkeeper (#13688)Eugen Rochko
There are no obvious ways it could be misused, as the secret is not really used for anything, but it is best to secure it for the future Follow-up to #13613
2020-05-10fix rubocop errors (#13690)Lerk
2020-05-10[Glitch] Add remote only to public timelineTakeshi Umeda
Port 26b08a3c54847f2816f78c3ac67ace001d3fea1f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-10[Glitch] Fix use of inline CSS in public pagesThibG
Port c0b849bdfda8a2386bc85836d2d181890746de98 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.
2020-05-10Refactor monkey-patching of Goldfinger (#12561)Eugen Rochko
2020-05-10Add `vi` to available locales (#13542)taicv
* Enable selecting Vietnamese language in Admin Dashboard * Update settings_helper.rb Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-05-10Add ability to remove identity proofs from account (#13682)Eugen Rochko
Fix #12613
generated by cgit-pink (git 2.37.1) at 2024-11-02 10:44:04 +0000