about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-08-31Fix crash when opening detailed view of a status you boostedThibaut Girka
2020-08-31Merge branch 'glitch' into mainStarfall
2020-08-30Merge pull request #1411 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-08-30Adapt 2FA changes to glitch-soc's theming systemThibaut Girka
2020-08-30[Glitch] Add WebAuthn as an alternative 2FA methodsantiagorodriguez96
Port CSS changes from e8d41bc2fe9418613cdc118c8674fc5fe7856685 Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30[Glitch] Fix: also use custom private boost icon for detailed statusTdxdxoz
Port a3ec9af9b009d4548e3e8f7369213883212a922a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30[Glitch] Better manage subscriptionCountersDaigo 3 Dango
Port 9669557be1d9c8577564242861bdbad9b821906a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30[Glitch] reword "boost to original audience" as per tootsuite#14596proxy
Port 46210a65d1cc4c53fb69fd9c904bdf2d5679d179 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30[Glitch] Fix click range discrepancies in gifvTakeshi Umeda
Port debf6ae31609dcc2fda224b4a6014848cb0e5a27 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30[Glitch] Fix scrolling issues when closing some dropdown menusThibG
Port c7cfd4e67aedb38cba3ee452e18bd086e30e2e5d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.
2020-08-30Add support for dereferencing objects through bearcaps (#14683)Eugen Rochko
2020-08-30Fix inefficiencies in fan-out-on-write service (#14682)Eugen Rochko
2020-08-30Fix videos with near-60 fps being rejected (#14684)Eugen Rochko
Fix #14668
2020-08-29Fix replying to some remote toots switching to local-onlyThibaut Girka
2020-08-29fix: make Procfile compatible with herokuish (#12685)Aurelia
Co-authored-by: Aurelia <aurelia@serenitylabs.cloud>
2020-08-28Introduce ApplicationController#cache_collection_paginated_by_id (#14677)Akihiko Odaki
* Replace incorrect use of distinct with group Some uses of ActiveRecord::QueryMethods#distinct pass field names but they are incorrect for the current version of Rails. ActiveRecord::QueryMethods#group provides the expected behavior and benefits performance. See commit 6da24aad4cafdef8d8a2c92bac2002a5fc2fe9c8. * Introduce ApplicationController#cache_collection_paginated_by_id ApplicationController#cache_collection_paginated_by_id fuses ApplicationController#cache_collection and Paginable.paginate_by_id. An advantage of this method is that it prevents from modifying scope which Paginable.paginate_by_id may provide. ApplicationController#cache_collection always return an array and there is no possibility of the scope modification. It is also clear for a programmer, considering the implication of "cache". This method can also emit more efficient queries by using Cacheable.cache_ids before calling Paginable.paginate_by_id.
2020-08-28Eagerly load statuses with the main query in Api::V1::BookmarksController ↵Akihiko Odaki
(#14674) This is same with commit 552e886b648faa2a2229d86c7fd9abc8bb5ff99c except that it was for Api::V1::FavouritesController while this is for Api::V1::BookmarksController.
2020-08-28Replace incorrect use of distinct with group (#14675)Akihiko Odaki
Some uses of ActiveRecord::QueryMethods#distinct pass field names but they are incorrect for the current version of Rails. ActiveRecord::QueryMethods#group provides the expected behavior and benefits performance. See commit 6da24aad4cafdef8d8a2c92bac2002a5fc2fe9c8.
2020-08-28Eagerly load statuses with the main query in Api::V1::FavouritesController ↵Akihiko Odaki
(#14673) The old implementation had two queries: 1. The query constructed in Api::V1::FavouritesController#results 2. The query constructed in #cached_favourites, which is merged with 1. Both of them are issued againt PostgreSQL. The combination of the two queries caused the following problems: - The small window between the two queries involves race conditions. - Minor performance inefficiency. Moreover, the construction of query 2, which involves merging with query 1 has a bug. Query 1 is finalized with paginate_by_id, but paginate_by_id returns an array when min_id parameter is specified. The behavior prevents from merging the query, and in the real world, ActiveRecord simply ignores the merge (!), which results in querying the entire scan of statuses and favourites table. This change fixes these issues by simply letting query 1 get all the works done.
2020-08-26Bump events from 3.1.0 to 3.2.0 (#14653)dependabot[bot]
Bumps [events](https://github.com/Gozala/events) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/Gozala/events/releases) - [Changelog](https://github.com/Gozala/events/blob/master/History.md) - [Commits](https://github.com/Gozala/events/compare/v3.1.0...v3.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Merge branch 'glitch' into mainStarfall
2020-08-25Fix spacing around reblog counter in detailed statusesThibaut Girka
And bring the whole thing closer to upstream's code.
2020-08-25Fix not being able to unbookmark toots when blocked by their author (#14604)ThibG
* Fix not being able to unbookmark toots when blocked by their author * Add tests
2020-08-25Fix client-side form validation not accepting handles with uppercase letters ↵ThibG
(#14599)
2020-08-25Bump aws-partitions from 1.353.0 to 1.356.0 (#14578)dependabot[bot]
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.353.0 to 1.356.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[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump tty-color from 0.5.1 to 0.5.2 (#14547)dependabot[bot]
Bumps [tty-color](https://github.com/piotrmurach/tty-color) from 0.5.1 to 0.5.2. - [Release notes](https://github.com/piotrmurach/tty-color/releases) - [Changelog](https://github.com/piotrmurach/tty-color/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-color/compare/v0.5.1...v0.5.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump abab from 2.0.3 to 2.0.4 (#14550)dependabot[bot]
Bumps [abab](https://github.com/jsdom/abab) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/jsdom/abab/releases) - [Changelog](https://github.com/jsdom/abab/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsdom/abab/compare/2.0.3...2.0.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump fugit from 1.3.6 to 1.3.8 (#14548)dependabot[bot]
Bumps [fugit](https://github.com/floraison/fugit) from 1.3.6 to 1.3.8. - [Release notes](https://github.com/floraison/fugit/releases) - [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/fugit/compare/v1.3.6...v1.3.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump jest-haste-map from 26.1.0 to 26.2.2 (#14552)dependabot[bot]
Bumps [jest-haste-map](https://github.com/facebook/jest/tree/HEAD/packages/jest-haste-map) from 26.1.0 to 26.2.2. - [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/v26.2.2/packages/jest-haste-map) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump pkg-config from 1.4.1 to 1.4.2 (#14549)dependabot[bot]
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.1...1.4.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump premailer from 1.12.1 to 1.13.1 (#14544)dependabot[bot]
Bumps [premailer](https://github.com/premailer/premailer) from 1.12.1 to 1.13.1. - [Release notes](https://github.com/premailer/premailer/releases) - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.12.1...v1.13.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump chunky_png from 1.3.11 to 1.3.12 (#14545)dependabot[bot]
Bumps [chunky_png](https://github.com/wvanbergen/chunky_png) from 1.3.11 to 1.3.12. - [Release notes](https://github.com/wvanbergen/chunky_png/releases) - [Changelog](https://github.com/wvanbergen/chunky_png/blob/master/CHANGELOG.rdoc) - [Commits](https://github.com/wvanbergen/chunky_png/compare/v1.3.11...v1.3.12) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump rdf from 3.1.4 to 3.1.5 (#14543)dependabot[bot]
Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.4...3.1.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump use-latest from 1.0.0 to 1.1.0 (#14541)dependabot[bot]
Bumps [use-latest](https://github.com/Andarist/use-latest) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/Andarist/use-latest/releases) - [Commits](https://github.com/Andarist/use-latest/compare/v1.0.0...v1.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump aws-sdk-s3 from 1.75.0 to 1.76.0 (#14542)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.75.0 to 1.76.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>
2020-08-25Bump brakeman from 4.8.2 to 4.9.0 (#14540)dependabot[bot]
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.8.2 to 4.9.0. - [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.8.2...v4.9.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump concurrent-ruby from 1.1.6 to 1.1.7 (#14539)dependabot[bot]
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.6 to 1.1.7. - [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases) - [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.6...v1.1.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Bump @babel/core from 7.10.5 to 7.11.1 (#14554)dependabot[bot]
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.5 to 7.11.1. - [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.11.1/packages/babel-core) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25Remove dependency on unused and unmaintained http_parser.rb gem (#14574)ThibG
It seems that years ago, the “http” gem dependend on the “http_parser.rb” gem (it now depends on the “http-parser” gem), and, still years ago, we pulled it from git in order to benefit from a bugfix that wasn't released yet (#7467).
2020-08-25Change styling to always have scrollbar on search resultsThibaut Girka
2020-08-25Fix WebUI crash in edge case when media display size causes scrollThibaut Girka
Fixes #1406
2020-08-25Fix invites pageStarfall
2020-08-25[Glitch] Add client-side validation in password change formsThibG
Port 7dc4c742650ac69ec9a4459b656e172283511e4c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-25[Glitch] Add HTML form validation for the registration formThibG
Port d70c3ab4c39e642d41138ab693af77dd6c258e8c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-25Fix destructuring error when unsubscribing without subscribing (#14566)Eugen Rochko
2020-08-25Improve email address validation (#14565)ThibG
* Increase DNS timeout from 1 second to 5 seconds for MX check 1 seconds is rather short when using a recursive DNS resolver which hasn't got a cached result already available. Use 5 seconds instead, which is the timeout value we use for outgoing HTTP queries. * Add more precise error messages for invalid e-mail addresses
2020-08-25Add client-side validation in password change forms (#14564)ThibG
* Fix client-side username validation at registration It used the Account::USERNAME_RE regexp which is for *remote* users, local user validation is stricter. Also take into account max username length. * Add client-side form validation for password change * Add client-side form validation to dedicated registration form Previous changes only applied to the /about page, not the dedicated form on /auth
2020-08-25Add HTML form validation for the registration form (#14560)ThibG
* Add HTML-level validation of username in sign-up form * Make required fields with incorrect values more visible * Enable HTML form validation for the registration form * Mark agreement checkbox as required client-side * Add minimum length to password * Add client-side password confirmation validation
2020-08-25Fix styling of display names and account handles, make it closer to upstreamThibaut Girka