about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-06-17Merge pull request #1358 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-06-17[Glitch] Add hints about incomplete remote content to web UIEugen Rochko
Port 3e9dc4044bb7e1ef6131fbd6430ed85b3cc2fcfa to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17[Glitch] Fix initial audio volume not corresponding to what's displayedThibG
Port 755e8c76ab28a99905c66082757d892939e70c49 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17[Glitch] Fixed emoji detection problem to append borderfuyu
Port b1484cf3ceebe1f1f083e4c06872493dc0a68511 to glitch-soc Co-authored-by: ThibG <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency
2020-06-17Bump parallel from 1.19.1 to 1.19.2 (#14069)dependabot[bot]
Bumps [parallel](https://github.com/grosser/parallel) from 1.19.1 to 1.19.2. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-17Suppress Redis#exists(key) warning (#14067)mayaeh
2020-06-17Bump capistrano from 3.14.0 to 3.14.1 (#14037)dependabot[bot]
* Bump capistrano from 3.14.0 to 3.14.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1) Signed-off-by: dependabot[bot] <support@github.com> * Bump capistrano from 3.14.0 to 3.14.1 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-06-17[Security] Bump rack from 2.2.2 to 2.2.3 (#14064)mayaeh
2020-06-17Bump sanitize from 5.2.0 to 5.2.1 (#14063)dependabot[bot]
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.0...v5.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-16Bump parallel_tests from 2.32.0 to 3.0.0 (#14044)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-16Bump bundler-audit from 0.6.1 to 0.7.0.1 (#14034)dependabot[bot]
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.1 to 0.7.0.1. - [Release notes](https://github.com/postmodern/bundler-audit/releases) - [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md) - [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.1...v0.7.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump jest from 25.4.0 to 26.0.1 (#14056)dependabot[bot]
Bumps [jest](https://github.com/facebook/jest) from 25.4.0 to 26.0.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v25.4.0...v26.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Fix initial audio volume not corresponding to what's displayed (#14057)ThibG
2020-06-15Bump excon from 0.73.0 to 0.74.0 (#14046)dependabot[bot]
Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.73.0...v0.74.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump eslint-plugin-import from 2.20.2 to 2.21.2 (#14054)dependabot[bot]
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.2 to 2.21.2. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.2...v2.21.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump css-loader from 3.5.3 to 3.6.0 (#14041)dependabot[bot]
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.3...v3.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump devise from 4.7.1 to 4.7.2 (#14045)dependabot[bot]
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump net-ssh from 6.0.2 to 6.1.0 (#14050)dependabot[bot]
Bumps [net-ssh](https://github.com/net-ssh/net-ssh) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/net-ssh/net-ssh/releases) - [Changelog](https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt) - [Commits](https://github.com/net-ssh/net-ssh/compare/v6.0.2...v6.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump rubocop-rails from 2.5.2 to 2.6.0 (#14047)dependabot[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.2 to 2.6.0. - [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.5.2...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump @babel/plugin-transform-react-inline-elements from 7.9.0 to 7.10.1 (#14048)dependabot[bot]
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.9.0 to 7.10.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-react-inline-elements) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump httplog from 1.4.2 to 1.4.3 (#14043)dependabot[bot]
Bumps [httplog](https://github.com/trusche/httplog) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.4.2...v1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump merge2 from 1.3.0 to 1.4.1 (#14052)dependabot[bot]
Bumps [merge2](https://github.com/teambition/merge2) from 1.3.0 to 1.4.1. - [Release notes](https://github.com/teambition/merge2/releases) - [Commits](https://github.com/teambition/merge2/compare/v1.3.0...v1.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump jsx-ast-utils from 2.3.0 to 2.4.1 (#14040)dependabot[bot]
Bumps [jsx-ast-utils](https://github.com/evcohen/jsx-ast-utils) from 2.3.0 to 2.4.1. - [Release notes](https://github.com/evcohen/jsx-ast-utils/releases) - [Changelog](https://github.com/jsx-eslint/jsx-ast-utils/blob/master/CHANGELOG.md) - [Commits](https://github.com/evcohen/jsx-ast-utils/compare/2.3.0...v2.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump node-releases from 1.1.57 to 1.1.58 (#14053)dependabot[bot]
Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.57 to 1.1.58. - [Release notes](https://github.com/chicoxyzzy/node-releases/releases) - [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.57...v1.1.58) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump opencollective-postinstall from 2.0.2 to 2.0.3 (#14042)dependabot[bot]
Bumps [opencollective-postinstall](https://github.com/opencollective/opencollective-postinstall) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/opencollective/opencollective-postinstall/releases) - [Commits](https://github.com/opencollective/opencollective-postinstall/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump redis from 4.1.4 to 4.2.1 (#14038)dependabot[bot]
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.4 to 4.2.1. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.1.4...v4.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump regenerate from 1.4.0 to 1.4.1 (#14051)dependabot[bot]
Bumps [regenerate](https://github.com/mathiasbynens/regenerate) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/mathiasbynens/regenerate/releases) - [Commits](https://github.com/mathiasbynens/regenerate/compare/v1.4.0...v1.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump ast from 2.4.0 to 2.4.1 (#14035)dependabot[bot]
Bumps [ast](https://github.com/whitequark/ast) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/whitequark/ast/releases) - [Changelog](https://github.com/whitequark/ast/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/ast/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-15Bump aws-sdk-s3 from 1.67.1 to 1.68.1 (#14033)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.67.1 to 1.68.1. - [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>
2020-06-15Add a default DB_HOST to .env.vagrant for enable the streaming (#14030)fuyu
2020-06-14Add hints about incomplete remote content to web UI (#14031)Eugen Rochko
2020-06-10Fixed emoji detection problem to append border (#14020)fuyu
* Fixed emoji detection problem to append border * Add tests * Add missing semicolon * Fixed wrong result when includes different variation selector * Add missing semicolon * Remove grapheme-splitter and Change emoji list to array from string * Update comment * Remove spaces Co-authored-by: ThibG <thib@sitedethib.com>
2020-06-10Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix ↵Shlee
glitch-soc#1348) (#14016) * Update docker-compose.yml * Update docker-compose.yml * Update docker-compose.yml * Update docker-compose.yml * Update docker-compose.yml
2020-06-10Fix TL sometimes jumping when closing modals (#14019)ThibG
Fixes #14018
2020-06-10Merge pull request #1356 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-06-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-09Fix WebUI crash when processing accounts before page is loaded (#14015)ThibG
2020-06-09Disable dependabotThibaut Girka
2020-06-09Merge pull request #1350 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-06-09[Glitch] Fix WebUI crash when loading account data before page is loadedThibaut Girka
2020-06-09Disable E2EE-related routesThibaut Girka
Not that I think they are an issue, but the API is likely to change, and isn't versioned, so I don't want to that be an issue since we also don't have clear versioning in glitch-soc.
2020-06-09[Glitch] Add hotkey for toggling content warning composer fieldThibG
Port 6b6a9d0ea362f4e301b56ae817f6c5d1761234b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-09[Glitch] Improve rendering of emoji which do not contrast with backgroundThibG
Port db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] FIX: filters ignore media descriptionsBen Lubar
Port c66403b2579587d8c1448be3ad30dc388d5f29c3 to glitch-soc Co-authored-by: Thibaut Girka <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] Hide sensitive preview cards with blurhashThibG
Port 8e96510b2528056e84cf8d0ed68d2e686e566180 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] Fix ref attr for react-textarea-autozsizeYamagishi Kazutoshi
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.
2020-06-09Add hotkey for toggling content warning composer field (#13987)ThibG