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

[pull] main from solidusio:main #364

Merged
merged 21 commits into from
Sep 26, 2023
Merged

[pull] main from solidusio:main #364

merged 21 commits into from
Sep 26, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Sep 13, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

elia added 13 commits September 20, 2023 16:56
Block handling in ERB is different than a regular method. Regular
methods are interested in the return value, while for ERB we need to
capture the ERB output produced by running the block and discard the
return value. The `capture` method does just that.
Also moves `#icon` from a sequential argument to a keyword argument.

The list of sections was only used to match the current path, because
top-level menu items should be active whenever any of the children
items are active.
The first part will just setup options and the bottom of the method
takes care of generating the "tab".
The menu item will now be able to tell if a request matches itself.
Use MenuItem instances for second level backend menus instead of
partials.
The condition option was duplicating what the children were already
checking.
Rely on the implicit array ordering.
[Backend] cleanup `MenuItems` generation
MauricioTRP and others added 5 commits September 25, 2023 17:48
Added missing select2_local es-CL
There is no code path that creates adjustments from return
authorizations (since a long time).

This line was introduced without a lot of context in 2013, and there is
nothing in the current codebase that warrants this scope.
…izations-scope

Remove Spree::Adjustment.return_authorization scope
@pull pull bot merged commit 69ba182 into nebulab:main Sep 26, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants