Rails 4.1.1 #415
Merged
Rails 4.1.1 #415
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
The permit matcher now conflicts with the shoulda permit matcher this renames the permit matcher to permit_authorization to prevent this conflict and to make intentions a bit more clear.
To prevent the validates_uniqueness matcher from raising a chef version constraint error this pins shoulda-matchers at a commit where setting default values for scopes was reverted, we can remove this ref once it's released to rubygems.
| @@ -55,6 +55,8 @@ def search | |||
| @results = Cookbook.search( | |||
| params.fetch(:q, nil) | |||
| ).offset(@start).limit(@items) | |||
|
|
|||
| @total = @results.count(:all) | |||
There was a problem hiding this comment.
I don't think the (:all) is necessary, is it? Isn't that just an alias for *, which is the default for count?
There was a problem hiding this comment.
There was a recent change to the count method it doesn't play nice with pg_search see this issue and this issue the recommendation seems to be to explicitly call count(:all) if you have any better suggestions let me know.
There was a problem hiding this comment.
Thanks for enlightening me.
|
@raskchanky did you review all of this? This good to go? |
|
Yep 👍 |
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.
🍴 Upgrades to Rails 4.1.1 and makes a few changes to account for some API changes.