Sync with Master repository #1
Merged
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
Ignore some files
…in the future ...` in specs by skipping locale validation in spec_helper (using Rails 3 behavior).
Gemspec update
Add docs badge to README
Fix deprecation `I18n.enforce_available_locales will default to true in the future ...`
change cancan -> cancancan in the text, for consistancy
Update README.rdoc
The module adapters are conditionally loaded if the proper pre-reqs are included in the project. Thus, we don't need to load each individually using an ENV variable. We can also test multiple adapters in the same project at the same time.
It is not specific to a appraisal build, since we're defining and using it in spec_helper
This will be replaced with `appraisal rake`
Since bson_ext is technically optional, only use it for non JRuby builds... as C extensions don't build on JRuby.
It should be extracted out the adapter, but the logic is too complex at the moment to refactor it out... so we'll guard.
…ted to bryanrite/cancancan.
Thought this might be useful for people coming to this Gem unaware of it's CanCan heritage.
Fixed a couple of gem name references.
RSpec does not automatically include > 2.13, but only do it for RSpec > 1... added a deprecation for RSpec < 2
Require RSpec Expectations
cefigueiredo
added a commit
that referenced
this pull request
Apr 13, 2014
Sync with Master repository
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.