Changeset [bbef833af0cee773a0984b57fe664f8cbf3f08c5] by Shawn Balestracci
Revision bbef833af0cee773a0984b57fe664f8cbf3f08c5,
committed by Shawn Balestracci
· April 18th, 2015 @ 11:02 AM
upgrade devise to 2.1
Conflicts:
Gemfile Gemfile.lock app/helpers/login_helper.rb
https://github.com/vegantech/sims/commit/bbef833af0cee773a0984b57fe...
6 changed files
-
M
Gemfile -
M
Gemfile.lock -
M
app/views/layouts/application.html.erb -
M
config/locales/devise.en.yml -
M
features/regular_user/forgot_password.feature -
M
spec/helpers/login_helper_spec.rb