binstubs regeneration

Looks like your app's ./bin/rails is a stub that was generated by Bundler.

In Rails 4, your app's bin/ directory contains executables that are versioned
like any other source code, rather than stubs that are generated on demand.

Here's how to upgrade:

  bundle config --delete bin    # Turn off Bundler's stub generator
  rake rails:update:bin         # Use the new Rails 4 executables
  git add bin                   # Add bin/ to source control

You may need to remove bin/ from your .gitignore as well.

When you install a gem whose executable you want to use in your app,
generate it and add it to source control:

  bundle binstubs some-gem-name
  git add bin/new-executable
Switch from cancan to cancancan and drop unused mentors#permitted_params.
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411
Merge remote-tracking branch 'upstream/features/ruby_212_rails_411' into features/ruby_212_rails_411