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

Rails 5 mongoid 6 #105

Merged
merged 26 commits into from Sep 14, 2017
Merged

Rails 5 mongoid 6 #105

merged 26 commits into from Sep 14, 2017

Conversation

boie0025
Copy link
Member

@boie0025 boie0025 commented Jun 6, 2017

Changes for Mongoid 6,update readme, pull in older fixes for misc bugs and green specs on rails 5.0.x and mongoid 6.0.x

trekdemo and others added 23 commits January 28, 2014 14:59
The previous version caused 3 query:
1. collection.empty? => load an item to ensure there are items in the collection
2. collection.first ... => again load an item to be sure about we querying mongo
3. collection.count(true) => actual count command
With this approach mongoid will fire only one count query
…ngoid into pencilcheck-patch-1

Conflicts:
	lib/active_admin/mongoid/helpers/collection.rb
Copy link
Member

@elia elia left a comment

Choose a reason for hiding this comment

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

Just one nitpick, but overall I think it's 👍🏼

gem.add_runtime_dependency 'mongoid', ['> 3.0', '< 5.0']
gem.add_runtime_dependency 'activeadmin', ['>= 1.0.0.pre', '< 2']
gem.add_runtime_dependency 'mongoid', ['>= 6.0', '< 6.1']
gem.add_runtime_dependency 'activeadmin', ['>= 1.0.0.pre5', '< 2']
Copy link
Member

Choose a reason for hiding this comment

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

@boie0025 what about just using ~> 1.0 here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good call

@varyonic
Copy link

varyonic commented Aug 8, 2017

@boie0025 Are you going to merge?

@boie0025
Copy link
Member Author

boie0025 commented Aug 9, 2017

Yes, doing a bit more testing in our on this before we pull it into master. Will merge and release soon.

@boie0025 boie0025 merged commit e352775 into master Sep 14, 2017
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.

None yet

5 participants