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.

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

Fix an issue with a missing argument to resolve_pack #2261

Merged
merged 1 commit into from
Jul 1, 2023

Conversation

viviicat
Copy link

I was getting an error and noticed that this argument was missing. I get an error about it when I try to load a theme that has the inherit setting. This seems to fix it.

Copy link

@ClearlyClaire ClearlyClaire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for spotting this issue! I think we want to load the 'default' skin as fallback nevermind that, I think this is fine.

@ClearlyClaire ClearlyClaire merged commit 155fc45 into glitch-soc:main Jul 1, 2023
neatchee added a commit to neatchee/mastodon that referenced this pull request Jul 3, 2023
* Remove the search button from UI header when logged out (mastodon#25631)

* Change account search to match by text when opted-in (mastodon#25599)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Fix ResolveURLService not resolving local URLs for remote content (mastodon#25637)

* Remove `pkg-config` gem dependency (mastodon#25615)

* Update Crowdin configuration file

* Fix onboarding prompt being displayed because of disconnection gaps (mastodon#25617)

* Use an Immutable Record as the root state (mastodon#25584)

* Add index to backups on `user_id` column (mastodon#25647)

* Fix rails `rewhere` deprecation warning in directories api controller (mastodon#25625)

* Remove unused routes (mastodon#25578)

* Fixing an issue with a missing argument (glitch-soc#2261)

undefined

* Update uri to version 0.12.2 (CVE fix) (mastodon#25657)

* Change local and federated timelines to be in a single firehose column (mastodon#25641)

* Fix HTTP 500 in `/api/v1/emails/check_confirmation` (mastodon#25595)

* Rails 7 update (mastodon#24241)

* Change dropdown icon above compose form from ellipsis to bars in web UI (mastodon#25661)

* Prevent duplicate concurrent calls of `/api/*/instance` in web UI (mastodon#25663)

* Revert "Rails 7 update" (mastodon#25667)

* [Glitch] Remove the search button from UI header when logged out

Port 285a691 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix onboarding prompt being displayed because of disconnection gaps

Port 9934949 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Use an Immutable Record as the root state

Port 78ba12f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Change local and federated timelines to be in a single firehose column

Port cea9db5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI

Port 0512537 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI

Port 5b46345 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Show local-only posts in “All” by default, and add back option to toggle it

* Fix showing local only toots in "All" (glitch-soc#2265)

* Fix warnings about missing dependency in hooks

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add `allowLocalOnly` to timelineId

Without this local-only toots will never be loaded.

feedType is checked to be public to not show local-only toots in the "Remote" tab.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add regex filter back to firehose (glitch-soc#2266)

* Add regex filter back to firehose

The regex filter will apply to all tabs and not be automatically applied when pinned.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Keep regex when pinned

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: jsgoldstein <jakegoldstein95@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Vivianne <puttabutta@gmail.com>
Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com>
Co-authored-by: mogaminsk <mgmnjp@icloud.com>
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants