Issue #687: cancan inserting "AND (NULL)" at the end of sql

Ensure that empty conditions does not trigger unmergeable conditions

Refold generated Ability comments at 80 characters

[ci skip]

A lot of people still fold their code at 80 characters, so it is
nice to have generated code consider this.

Add Code Climate badge

Namespaced Controllers not building new resource from params(regression 1.6.8)

Segmentation fault on aliasing

Fix for issue #560

removing project status section from readme since contributors are now kind enough to keep tabs on the issue tracker

Init attributes in InheritedResources controller w/ specs

Fixes Nested Resource Loading

Check for defined ActionController::Base instead ActionController 

Fix pull request 640. For some reason github didn't allow a clean merge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.

Remove inconsistent line breaks.

Allow users to specify a mix of can and cannot rule for mongoid

Fix to handle MetaWhere and non-MetaWhere conditions correctly.

Adding Ability#merge

Updated: port fix for namespaced params from 2.0 back to 1.6

Fix 'spec/spec_helper.rb:20: uninitialized constant WithModel (NameError)'

Fix "uninitialized constant CanCan::Rule::ModelAdapters"

Fixed a small typo