Updating current master branch with the master branch at the origin repo #1
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
Putting the newer version last ensures that we get the expected diff. Otherwise, we see additions and removals switched.
To give more visibility to the different funding options.
Co-Authored-By: Javier Julio <javierjulio@icloud.com>
Update pundit links to canonical repo
It's very common to make experimental modifications to test applications. This makes it very easy to go back to the freshly generated application without having to regenerate it, by running `git checkout .`, or to even keep track of the experimental changes being done using git.
When retrieving the policy for an `ActiveAdmin::Page`, and the pundit namespace is `:active_admin`, we need an extra check so that the right policy is properly picked up.
We no longer need this, since we support rubies above or equal to 2.4.
The blank line before class end is hard to eliminate without making the template messy. So I add a blank line before class begin so that the generated class is a bit prettier.
The model generator only generates: * Model, which we are fully overwriting later. * Unit tests, which we don't use. * Migration. So using the migration generator seems better.
Enable `Layout/SpaceAroundOperators` cop
Generator cleanup
Broken when the template was reindented.
Co-authored-by: coezbek <christopher@oezbek.org>
Co-authored-by: coezbek <christopher@oezbek.org>
This gets us ready to support the final release of Rails 6.0, and also allows activeadmin to be tried against Rails master more easily.
* Re-use I18n translations of formtastic ~ Labels * Undo unnecessary change and add a spec * Simplify
Current Rails master (6.1.0.alpha) adds a new --timestamps option to the migration generator that it's true by default. So to get migrations running under Rails master, we need to make sure we don't generate duplicate timestamp columns by using both explicit columns and the new (default) option at the same time.
It's handy to do this now to force the cache to be regenerated at the right place.
Setup dependabot
* Use $sidebar-with to calculate right-margin of #main_content * Add parenthesis to improve readability Co-Authored-By: Javier Julio <javierjulio@icloud.com> * Add changelog entry for #5887 * Add definition of user and PR to changelog
Let's save the word "Removals" for removals that we consider to be "Breaking Changes".
This is quite subjective, and unnecessary complicates the nesting of the changelog structure.
Clarify changelog
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.