Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use composable query in Status.without_replies scope #30086

Merged
merged 1 commit into from Apr 29, 2024
Merged

Use composable query in Status.without_replies scope #30086

merged 1 commit into from Apr 29, 2024

Conversation

mjankowski
Copy link
Contributor

Splitting up the scope to make more composable/readable, avoid string programming.

SQL is basically the same...

In main now:

irb(main):001> Status.without_replies
  Status Load (5.1ms)  SELECT "statuses".* FROM "statuses" WHERE "statuses"."deleted_at" IS NULL AND (statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id) /* loading for pp */ ORDER BY "statuses"."id" DESC LIMIT $1  [["LIMIT", 11]]
=> []

With this change:

irb(main):001> Status.without_replies
  Status Load (4.9ms)  SELECT "statuses".* FROM "statuses" WHERE "statuses"."deleted_at" IS NULL AND ("statuses"."reply" = $1 OR "statuses"."in_reply_to_account_id" = "statuses"."account_id") /* loading for pp */ ORDER BY "statuses"."id" DESC LIMIT $2  [["reply", false], ["LIMIT", 11]]
=> []

@renchap renchap added refactoring Improving code quality ruby Pull requests that update Ruby code labels Apr 26, 2024
@ClearlyClaire ClearlyClaire added this pull request to the merge queue Apr 29, 2024
Merged via the queue into mastodon:main with commit ac7f4d5 Apr 29, 2024
35 checks passed
mgmn added a commit to mgmn/mastodon-kumarinco that referenced this pull request Apr 29, 2024
@mgmn
Squashed commit of the following:
edf2d3a 
commit e28e51d
Author: mogaminsk <mgmnjp@icloud.com>
Date:   Mon Apr 29 19:55:22 2024 +0900

    add `word-break: keep-all` into badge

commit 7d3fe2b
Author: Claire <claire.github-309c@sitedethib.com>
Date:   Mon Apr 29 11:55:41 2024 +0200

    Add loading indicator and empty result message to advanced interface search (mastodon#30085)

commit ac7f4d5
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 05:55:37 2024 -0400

    Use composable query in `Status.without_replies` scope (mastodon#30086)

commit 95e9de5
Author: Claire <claire.github-309c@sitedethib.com>
Date:   Mon Apr 29 11:45:58 2024 +0200

    Prevent accidental serialization of `Account` and `User` records (mastodon#30079)

commit e336466
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 05:33:27 2024 -0400

    Use shared form partial for `admin/rules` views (mastodon#30067)

commit a9816f0
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 05:33:06 2024 -0400

    Use shared form partial for `admin/warning_presets` views (mastodon#30069)

commit b9b4db4
Author: Renaud Chaput <renchap@gmail.com>
Date:   Mon Apr 29 11:29:59 2024 +0200

    Remove usage of deprecated `defaultTypes` on React functional components (mastodon#30099)

commit 2739d8d
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 05:10:23 2024 -0400

    Use shorter `render` call in `admin/webhooks` view (mastodon#30071)

commit bbf1b60
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 05:04:35 2024 -0400

    Remove unused `Account.popular` scope (mastodon#30068)

commit 6931cf5
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Apr 29 09:03:27 2024 +0000

    Update dependency aws-sdk-s3 to v1.148.0 (mastodon#30076)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 2123281
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 05:02:47 2024 -0400

    Move `Account` limits to constants (mastodon#30087)

commit f0c9cba
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 05:01:46 2024 -0400

    Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (mastodon#30088)

commit 4527e01
Author: Renaud Chaput <renchap@gmail.com>
Date:   Mon Apr 29 10:23:05 2024 +0200

    Convert `entrypoints/sign_up` to Typescript (mastodon#30106)

commit 9be7efe
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Apr 29 08:15:43 2024 +0000

    New Crowdin Translations (automated) (mastodon#30092)

    Co-authored-by: GitHub Actions <noreply@github.com>

commit 00aec2f
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Apr 29 08:10:20 2024 +0000

    Update peter-evans/create-pull-request action to v6.0.5 (mastodon#30112)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 0efa985
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Apr 29 10:10:04 2024 +0200

    Update libretranslate/libretranslate Docker tag to v1.5.7 (mastodon#30111)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 2322336
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Apr 29 10:09:50 2024 +0200

    Update eslint (non-major) (mastodon#30110)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit c0584a6
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Apr 29 08:09:27 2024 +0000

    Update devDependencies (non-major) (mastodon#30109)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 31f3dd5
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Apr 29 10:08:58 2024 +0200

    Update dependency rubocop to v1.63.4 (mastodon#30096)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit d8a4cea
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Apr 29 10:08:43 2024 +0200

    Update dependency haml_lint to v0.58.0 (mastodon#30094)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 3690906
Author: Renaud Chaput <renchap@gmail.com>
Date:   Mon Apr 29 10:02:41 2024 +0200

    Convert easy entrypoints files to Typescript (mastodon#30102)

commit 4f4b779
Author: David Beck <davbeck@users.noreply.github.com>
Date:   Mon Apr 29 00:55:58 2024 -0700

    Remove home marker updates (mastodon#22721)

commit 7201f99
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Apr 29 03:41:59 2024 -0400

    Change default ruby version to 3.3.1 (mastodon#28013)
@mjankowski mjankowski deleted the status-without-replies-scope branch April 29, 2024 12:12
DismalShadowX added a commit to DismalShadowX/Masto-Cherry that referenced this pull request Apr 29, 2024
@DismalShadowX @mjankowski
@davbeck @renchap @renovate @github-actions @web-flow @ClearlyClaire
Bagel o themes (#9)
8b6ebf7 
* Tangerine UI

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update localized string name

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Rolle's BirdUI theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-dark.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-light.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-contrast

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-accessible

Support for accessibility

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-contrast to mastodon-bird-ui-contrast.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-accessible to mastodon-bird-ui-accessible.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Add files via upload

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Compose-form is not taking effects without `!important`

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Change default ruby version to 3.3.1 (mastodon#28013)

* Remove home marker updates (mastodon#22721)

* Convert easy entrypoints files to Typescript (mastodon#30102)

* Update dependency haml_lint to v0.58.0 (mastodon#30094)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency rubocop to v1.63.4 (mastodon#30096)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update devDependencies (non-major) (mastodon#30109)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update eslint (non-major) (mastodon#30110)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update libretranslate/libretranslate Docker tag to v1.5.7 (mastodon#30111)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update peter-evans/create-pull-request action to v6.0.5 (mastodon#30112)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (mastodon#30092)

Co-authored-by: GitHub Actions <noreply@github.com>

* Convert `entrypoints/sign_up` to Typescript (mastodon#30106)

* Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (mastodon#30088)

* Move `Account` limits to constants (mastodon#30087)

* Update dependency aws-sdk-s3 to v1.148.0 (mastodon#30076)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove unused `Account.popular` scope (mastodon#30068)

* Use shorter `render` call in `admin/webhooks` view (mastodon#30071)

* Remove usage of deprecated `defaultTypes` on React functional components (mastodon#30099)

* Use shared form partial for `admin/warning_presets` views (mastodon#30069)

* Use shared form partial for `admin/rules` views (mastodon#30067)

* Prevent accidental serialization of `Account` and `User` records (mastodon#30079)

* Use composable query in `Status.without_replies` scope (mastodon#30086)

* Add loading indicator and empty result message to advanced interface search (mastodon#30085)

* Disable `Style/SignalException` cop (mastodon#30064)

* Remove unused memoization in `CustomFilter#expires_in` method (mastodon#30117)

* Update dependency ws to v8.17.0 (mastodon#30097)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Added peach theme by nileane

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Restored attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Restore attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Fixed incorrect branch tag from ronilaukkarinen

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

---------

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: David Beck <davbeck@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
DismalShadowX added a commit to DismalShadowX/Masto-Cherry that referenced this pull request Apr 29, 2024
@DismalShadowX @mjankowski
@davbeck @renchap @renovate @github-actions @web-flow @ClearlyClaire @shleeable
Bagel o themes (#10)
c84643b 
* Tangerine UI

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update localized string name

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Rolle's BirdUI theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-dark.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-light.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-contrast

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-accessible

Support for accessibility

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-contrast to mastodon-bird-ui-contrast.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-accessible to mastodon-bird-ui-accessible.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Add files via upload

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Compose-form is not taking effects without `!important`

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Change default ruby version to 3.3.1 (mastodon#28013)

* Remove home marker updates (mastodon#22721)

* Convert easy entrypoints files to Typescript (mastodon#30102)

* Update dependency haml_lint to v0.58.0 (mastodon#30094)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency rubocop to v1.63.4 (mastodon#30096)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update devDependencies (non-major) (mastodon#30109)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update eslint (non-major) (mastodon#30110)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update libretranslate/libretranslate Docker tag to v1.5.7 (mastodon#30111)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update peter-evans/create-pull-request action to v6.0.5 (mastodon#30112)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (mastodon#30092)

Co-authored-by: GitHub Actions <noreply@github.com>

* Convert `entrypoints/sign_up` to Typescript (mastodon#30106)

* Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (mastodon#30088)

* Move `Account` limits to constants (mastodon#30087)

* Update dependency aws-sdk-s3 to v1.148.0 (mastodon#30076)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove unused `Account.popular` scope (mastodon#30068)

* Use shorter `render` call in `admin/webhooks` view (mastodon#30071)

* Remove usage of deprecated `defaultTypes` on React functional components (mastodon#30099)

* Use shared form partial for `admin/warning_presets` views (mastodon#30069)

* Use shared form partial for `admin/rules` views (mastodon#30067)

* Prevent accidental serialization of `Account` and `User` records (mastodon#30079)

* Use composable query in `Status.without_replies` scope (mastodon#30086)

* Add loading indicator and empty result message to advanced interface search (mastodon#30085)

* Disable `Style/SignalException` cop (mastodon#30064)

* Remove unused memoization in `CustomFilter#expires_in` method (mastodon#30117)

* Update dependency ws to v8.17.0 (mastodon#30097)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Added peach theme by nileane

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Restored attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Restore attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Fixed incorrect branch tag from ronilaukkarinen

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* docker-compose.yml  `version` is obsolete (mastodon#30120)

* Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

---------

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: David Beck <davbeck@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Shlee <github@shl.ee>
DismalShadowX added a commit to DismalShadowX/Masto-Cherry that referenced this pull request Apr 29, 2024
@DismalShadowX @mjankowski
@davbeck @renchap @renovate @github-actions @web-flow @ClearlyClaire @shleeable
Bagel o themes (#11)
5fa948a 
* Tangerine UI

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update localized string name

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Rolle's BirdUI theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-dark.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-light.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-contrast

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-accessible

Support for accessibility

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-contrast to mastodon-bird-ui-contrast.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-accessible to mastodon-bird-ui-accessible.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Add files via upload

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Compose-form is not taking effects without `!important`

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Change default ruby version to 3.3.1 (mastodon#28013)

* Remove home marker updates (mastodon#22721)

* Convert easy entrypoints files to Typescript (mastodon#30102)

* Update dependency haml_lint to v0.58.0 (mastodon#30094)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency rubocop to v1.63.4 (mastodon#30096)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update devDependencies (non-major) (mastodon#30109)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update eslint (non-major) (mastodon#30110)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update libretranslate/libretranslate Docker tag to v1.5.7 (mastodon#30111)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update peter-evans/create-pull-request action to v6.0.5 (mastodon#30112)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (mastodon#30092)

Co-authored-by: GitHub Actions <noreply@github.com>

* Convert `entrypoints/sign_up` to Typescript (mastodon#30106)

* Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (mastodon#30088)

* Move `Account` limits to constants (mastodon#30087)

* Update dependency aws-sdk-s3 to v1.148.0 (mastodon#30076)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove unused `Account.popular` scope (mastodon#30068)

* Use shorter `render` call in `admin/webhooks` view (mastodon#30071)

* Remove usage of deprecated `defaultTypes` on React functional components (mastodon#30099)

* Use shared form partial for `admin/warning_presets` views (mastodon#30069)

* Use shared form partial for `admin/rules` views (mastodon#30067)

* Prevent accidental serialization of `Account` and `User` records (mastodon#30079)

* Use composable query in `Status.without_replies` scope (mastodon#30086)

* Add loading indicator and empty result message to advanced interface search (mastodon#30085)

* Disable `Style/SignalException` cop (mastodon#30064)

* Remove unused memoization in `CustomFilter#expires_in` method (mastodon#30117)

* Update dependency ws to v8.17.0 (mastodon#30097)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Added peach theme by nileane

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Restored attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Restore attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Fixed incorrect branch tag from ronilaukkarinen

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* docker-compose.yml  `version` is obsolete (mastodon#30120)

* Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

---------

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: David Beck <davbeck@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Shlee <github@shl.ee>
DismalShadowX added a commit to DismalShadowX/Masto-Cherry that referenced this pull request Apr 29, 2024
@DismalShadowX @mjankowski
@davbeck @renchap @renovate @github-actions @web-flow @ClearlyClaire @shleeable
Bagel o themes (#12)
89d04d9 
* Tangerine UI

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update localized string name

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Rolle's BirdUI theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-dark.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-light.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-contrast

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Create mastodon-bird-ui-accessible

Support for accessibility

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-contrast to mastodon-bird-ui-contrast.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Rename mastodon-bird-ui-accessible to mastodon-bird-ui-accessible.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Add files via upload

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Compose-form is not taking effects without `!important`

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Change default ruby version to 3.3.1 (mastodon#28013)

* Remove home marker updates (mastodon#22721)

* Convert easy entrypoints files to Typescript (mastodon#30102)

* Update dependency haml_lint to v0.58.0 (mastodon#30094)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency rubocop to v1.63.4 (mastodon#30096)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update devDependencies (non-major) (mastodon#30109)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update eslint (non-major) (mastodon#30110)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update libretranslate/libretranslate Docker tag to v1.5.7 (mastodon#30111)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update peter-evans/create-pull-request action to v6.0.5 (mastodon#30112)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (mastodon#30092)

Co-authored-by: GitHub Actions <noreply@github.com>

* Convert `entrypoints/sign_up` to Typescript (mastodon#30106)

* Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (mastodon#30088)

* Move `Account` limits to constants (mastodon#30087)

* Update dependency aws-sdk-s3 to v1.148.0 (mastodon#30076)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove unused `Account.popular` scope (mastodon#30068)

* Use shorter `render` call in `admin/webhooks` view (mastodon#30071)

* Remove usage of deprecated `defaultTypes` on React functional components (mastodon#30099)

* Use shared form partial for `admin/warning_presets` views (mastodon#30069)

* Use shared form partial for `admin/rules` views (mastodon#30067)

* Prevent accidental serialization of `Account` and `User` records (mastodon#30079)

* Use composable query in `Status.without_replies` scope (mastodon#30086)

* Add loading indicator and empty result message to advanced interface search (mastodon#30085)

* Disable `Style/SignalException` cop (mastodon#30064)

* Remove unused memoization in `CustomFilter#expires_in` method (mastodon#30117)

* Update dependency ws to v8.17.0 (mastodon#30097)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Added peach theme by nileane

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Restored attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Restore attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Fixed incorrect branch tag from ronilaukkarinen

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update themes.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update en.yml

Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Added support for peach theme

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* docker-compose.yml  `version` is obsolete (mastodon#30120)

* Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-multiple-columns.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update layout-single-column.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update tangerineui-cherry.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update tangerineui-purple.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

* Update tangerineui.scss

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>

---------

Signed-off-by: Nathan Sparrow <24910097+DismalShadowX@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: David Beck <davbeck@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Shlee <github@shl.ee>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ClearlyClaire ClearlyClaire ClearlyClaire approved these changes

Assignees
No one assigned
Labels
refactoring Improving code quality ruby Pull requests that update Ruby code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mjankowski @ClearlyClaire @renchap