forked from platanus/activeadmin_addons
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge original back into our codebase #1
Open
lopesrb
wants to merge
371
commits into
whitesmith:master
Choose a base branch
from
platanus:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Webpacker
I noticed when I tried this that the import, it wasnt working properly, swapping to the above import worked (had to inspect the node_modules folder.)
Fix import of SCSS in webpacker.
Setup Circle CI
…m-auto-deploy Release beta 2 and configure npm auto deploy
Fix link to PR #451 in CHANGELOG.md
Update Ruby to version 3.2
We wont't require ruby 3 just yet, but for testing purposes we need to remove it
fix(tests): fix chromedriver error for capybara tests
Now required in AA v3 / Ransack v4
Mainly, the 'contains' predicate, that was used as default in some components. These predicates were removed from activeadmin v3, since they were backports. More info here activeadmin/activeadmin#8010
Activeadmin v3 support
feat(): release v2 beta.3
Fix typo in slim-select_default.md
The following deprecation warning was addressed. ``` Deprecation Warning: Sass's behavior for declarations that appear after nested rules will be changing to match the behavior specified by CSS in an upcoming version. To keep the existing behavior, move the declaration above the nested rule. To opt into the new behavior, wrap the declaration in `& {}`. More info: https://sass-lang.com/d/mixed-decls ╷ 5 │ ┌ label { 6 │ │ display: none; 7 │ │ } │ └─── nested rule ... │ 5 │ ┌ label { 6 │ │ display: none; 7 │ │ } │ └─── nested rule ... │ 9 │ margin-bottom: 5px; │ ^^^^^^^^^^^^^^^^^^ declaration ╵ vendor/bundle/gems/activeadmin_addons-1.10.1/app/assets/stylesheets/activeadmin_addons/inputs/date-ti me-picker-filter.scss 9:5 @import (snip) ``` This warning is due to the following change in dart-sass. sass/dart-sass#2267
…on-warning Suppress sass deprecation warning
Co-authored-by: Michal Papis <[email protected]>
Co-authored-by: Raimundo Herrera <[email protected]>
fixing indentation
Add confirm_message to toggle-bool-switch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.