Merge branch 'release/1.8.4' into develop
Don't call helper_method if it does not exist
Merge pull request #91 from pusewicz/conditional-helper-method

Don't call helper_method if it does not exist
Sanitize params if they are required, regardless of action.
Fixes #59
Support 1.8 syntax.
Ensure we respect instance_name overrides in sanitizer param namespace.
Merge branch 'feature/params_actions' of github.com:CanCanCommunity/cancancan into feature/params_actions
Safer, backwards compatible sanitization for non-save methods.
On a :new action with GET parameters being sent in, we currently don’t sanitize those inputs and it causes a ForbiddenAttributes error because we are building the object with the params (even though we don’t save it). Now we make sure we sanitize parameters whenever we detect we should.

We also must do it on every ‘save action’ to be backwards compatible.
Update changelog.
[ci skip]
Split out separate adapters for AR 3 and AR 4

Detect the AR version and load different adapters
approrpriately. Shared code (which is most of it) is still in
`ActiveRecordAdapter`, though that's been converted into a module so
that both the adapters could remain direct subclasses of
AbstractAdapter (not sure if that was a good idea or not, but it seems
to be working).
Add rails 4 and 4.1 to travis
Add tests for more complicated table structure
Add some excludes to travis

ree (or at least this version), 1.9.2, and 1.8.7 are not supported by
rails 4.1
Update changelog
[ci skip]
Merge pull request #97 from CanCanCommunity/rails4-adapter

Rails4 adapter
Merge branch 'develop' into feature/params_actions

Conflicts:
	CHANGELOG.rdoc
Merge branch 'feature/params_actions' into develop
Release 1.9.0
Merge branch 'release/1.9.0'