diff --git a/Gemfile b/Gemfile index 93e91ed..a978330 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem "compass-rails", "~> 1.1.3" gem 'foundation-rails' gem 'turbolinks' gem 'uglifier', '>= 1.3.0' -gem 'bcrypt-ruby', git: 'https://github.com/codahale/bcrypt-ruby.git' +#gem 'bcrypt-ruby', git: 'https://github.com/codahale/bcrypt-ruby.git' gem 'sorcery', '>= 0.8.1' gem 'oauth2', '~> 0.8.0' gem 'ruby-drupal-hash' diff --git a/Gemfile.lock b/Gemfile.lock index d279b3c..ac4e465 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,12 +13,6 @@ GIT i18n-active_record (0.0.2) i18n (>= 0.5.0) -GIT - remote: https://github.com/codahale/bcrypt-ruby.git - revision: df09e4c73f2f3d9a134b2abf536ca5f159f33075 - specs: - bcrypt-ruby (3.1.2) - GEM remote: http://rubygems.org/ specs: @@ -52,6 +46,9 @@ GEM arel (4.0.2) atomic (1.1.14) awesome_print (1.2.0) + bcrypt (3.1.7-x86-mingw32) + bcrypt-ruby (3.1.5-x86-mingw32) + bcrypt (>= 3.1.3) better_errors (1.1.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -329,7 +326,6 @@ PLATFORMS DEPENDENCIES acts_as_list awesome_print - bcrypt-ruby! better_errors binding_of_caller bullet diff --git a/config/routes.rb b/config/routes.rb index 81e122c..2e373e4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -38,7 +38,7 @@ BikeBike::Application.routes.draw do end resources :users - #resources :user_sessions + resources :user_sessions #resources :organization_statuses