about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2021-01-07Merge remote-tracking branch 'glitchsoc/master' into mainStarfall
2021-01-06Merge pull request #1482 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2021-01-06[Glitch] Fix logo button style moreTakeshi Umeda
Port 3f4b0dfd47d35818b36fedb767a5a82dc02f87cc to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix logo button styleTakeshi Umeda
Port ba748a83f2050dff27758bce67c05d37a8b7d8f3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix getting-started footer in single column mode not being ↵Takeshi Umeda
clickable in Safari Port e38874dcf7b0fca0f9934fcd0e12bba457c7c212 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix defaultProps of frameRate to stringTakeshi Umeda
Port a50fe47a77118dba043143c01d0d6ad6c82f9b31 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix missing key in list timeline policyTakeshi Umeda
Port 71f09688878241f0a47fd637047afbf0148f0abf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.
2021-01-06update codeclimate-rubocop (#15500)abcang
2021-01-05Set X-Forwarded-Proto to request scheme (#15310) (#15498)Cecylia Bocovich
This fixes a bug that prevents logins to mastodon onion services. The nginx directive assumed all requests were made over https, causing a domain mismatch for onion services that have https redirects disabled. The fix more correctly sets X-Forwarded-Proto to the actual scheme used in the request.
2021-01-05Bump nokogiri from 1.10.10 to 1.11.0 (#15487)dependabot[bot]
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.0. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05Fix defaultProps of frameRate to string (#15493)Takeshi Umeda
2021-01-05Fix missing key in list timeline policy (#15494)Takeshi Umeda
2021-01-05Fix getting-started footer in single column mode not being clickable in ↵Takeshi Umeda
Safari (#15496)
2021-01-05Bump ruby-progressbar from 1.10.1 to 1.11.0 (#15491)dependabot[bot]
Bumps [ruby-progressbar](https://github.com/jfelchner/ruby-progressbar) from 1.10.1 to 1.11.0. - [Release notes](https://github.com/jfelchner/ruby-progressbar/releases) - [Changelog](https://github.com/jfelchner/ruby-progressbar/blob/master/CHANGELOG.md) - [Commits](https://github.com/jfelchner/ruby-progressbar/compare/releases/v1.10.1...releases/v1.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05Bump simplecov from 0.20.0 to 0.21.0 (#15485)dependabot[bot]
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.20.0...v0.21.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05Bump fuubar from 2.5.0 to 2.5.1 (#15488)dependabot[bot]
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/thekompanee/fuubar/releases) - [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md) - [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.5.0...releases/2.5.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05Bump tzinfo-data from 1.2020.5 to 1.2020.6 (#15479)dependabot[bot]
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.5 to 1.2020.6. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.5...v1.2020.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05Bump js-yaml from 3.14.1 to 4.0.0 (#15484)dependabot[bot]
* Bump js-yaml from 3.14.1 to 4.0.0 Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.14.1 to 4.0.0. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.14.1...4.0.0) Signed-off-by: dependabot[bot] <support@github.com> * Replace deprecated method Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-01-04Bump @testing-library/jest-dom from 5.11.6 to 5.11.8 (#15480)dependabot[bot]
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.6 to 5.11.8. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.6...v5.11.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04Bump eslint from 7.16.0 to 7.17.0 (#15483)dependabot[bot]
Bumps [eslint](https://github.com/eslint/eslint) from 7.16.0 to 7.17.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.16.0...v7.17.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04Bump webpack-dev-server from 3.11.0 to 3.11.1 (#15481)dependabot[bot]
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.11.0 to 3.11.1. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.1/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.0...v3.11.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04Bump eslint-plugin-react from 7.21.5 to 7.22.0 (#15482)dependabot[bot]
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.21.5 to 7.22.0. - [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases) - [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.21.5...v7.22.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04Bump sass from 1.30.0 to 1.32.0 (#15486)dependabot[bot]
Bumps [sass](https://github.com/sass/dart-sass) from 1.30.0 to 1.32.0. - [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.30.0...1.32.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Improve Emoji import (fix #15429) (#15430)Sophie Parker
* Improve Emoji import Skip macOS '._' shadow files in tar archive to speed up import * Fix codeclimate format issue with whitespace * Update lib/mastodon/emoji_cli.rb suggestions from Gargron to improve comment Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> * Update emoji_cli.rb Remove extraneous comment (macOS-specific comment now with correct line) Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-12-30Fix profile update not being sent on profile/header picture deletion (#15461)ThibG
Fixes #15460 Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-30Fix logo button style more (#15458)Takeshi Umeda
2020-12-30Fix expand video on public page (#15469)Takeshi Umeda
2020-12-30Bump i18n-tasks from 0.9.31 to 0.9.33 (#15445)dependabot[bot]
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.31 to 0.9.33. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.31...v0.9.33) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump memory_profiler from 0.9.14 to 1.0.0 (#15289)dependabot[bot]
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.14 to 1.0.0. - [Release notes](https://github.com/SamSaffron/memory_profiler/releases) - [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.14...v1.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump @rails/ujs from 6.0.3 to 6.1.0 (#15336)dependabot[bot]
Bumps [@rails/ujs](https://github.com/rails/rails) from 6.0.3 to 6.1.0. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.0.3...v6.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump @babel/preset-env from 7.12.7 to 7.12.11 (#15394)dependabot[bot]
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.12.7 to 7.12.11. - [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.11/packages/babel-preset-env) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump @babel/core from 7.12.7 to 7.12.10 (#15340)dependabot[bot]
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.7 to 7.12.10. - [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.10/packages/babel-core) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump cld3 from 3.3.0 to 3.4.1 (#15391)dependabot[bot]
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.3.0...v3.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump webmock from 3.10.0 to 3.11.0 (#15388)dependabot[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.10.0...v3.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump strong_migrations from 0.7.2 to 0.7.4 (#15389)dependabot[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.2 to 0.7.4. - [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.7.2...v0.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump rubocop-rails from 2.8.1 to 2.9.1 (#15390)dependabot[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.1 to 2.9.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.1...v2.9.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump webpack-bundle-analyzer from 4.1.0 to 4.3.0 (#15395)dependabot[bot]
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.1.0 to 4.3.0. - [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases) - [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.1.0...v4.3.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump rspec-rails from 4.0.1 to 4.0.2 (#15442)dependabot[bot]
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump brakeman from 4.10.0 to 4.10.1 (#15444)dependabot[bot]
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.10.0 to 4.10.1. - [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/v4.10.0...v4.10.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump object.values from 1.1.1 to 1.1.2 (#15248)dependabot[bot]
Bumps [object.values](https://github.com/es-shims/Object.values) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/es-shims/Object.values/releases) - [Changelog](https://github.com/es-shims/Object.values/blob/main/CHANGELOG.md) - [Commits](https://github.com/es-shims/Object.values/compare/v1.1.1...v1.1.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump tzinfo-data from 1.2020.4 to 1.2020.5 (#15448)dependabot[bot]
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.4 to 1.2020.5. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.4...v1.2020.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump @babel/plugin-proposal-decorators from 7.12.1 to 7.12.12 (#15451)dependabot[bot]
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.12.1 to 7.12.12. - [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.12/packages/babel-plugin-proposal-decorators) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump is-nan from 1.3.0 to 1.3.2 (#15455)dependabot[bot]
Bumps [is-nan](https://github.com/es-shims/is-nan) from 1.3.0 to 1.3.2. - [Release notes](https://github.com/es-shims/is-nan/releases) - [Changelog](https://github.com/es-shims/is-nan/blob/main/CHANGELOG.md) - [Commits](https://github.com/es-shims/is-nan/compare/v1.3.0...v1.3.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump axios from 0.21.0 to 0.21.1 (#15456)dependabot[bot]
Bumps [axios](https://github.com/axios/axios) from 0.21.0 to 0.21.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.0...v0.21.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump fastimage from 2.2.0 to 2.2.1 (#15449)dependabot[bot]
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump capybara from 3.33.0 to 3.34.0 (#15245)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.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.33.0...3.34.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump rubocop from 1.3.1 to 1.7.0 (#15447)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.3.1 to 1.7.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.3.1...v1.7.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump rqrcode from 1.1.2 to 1.2.0 (#15450)dependabot[bot]
Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 1.1.2 to 1.2.0. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits/v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump aws-sdk-s3 from 1.85.0 to 1.87.0 (#15446)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.85.0 to 1.87.0. - [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>
generated by cgit-pink (git 2.37.1) at 2024-07-07 17:34:34 +0000