bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

The working basics

Browse Source
This commit is contained in:
Godwin 2014-03-09 14:56:24 -06:00
parent db60933506
commit bbec690e2f
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -48,7 +48,7 @@ gem "compass-rails", "~> 1.1.3"
gem 'foundation-rails' gem 'foundation-rails'
gem 'turbolinks' gem 'turbolinks'
gem 'uglifier', '>= 1.3.0' 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 'sorcery', '>= 0.8.1'
gem 'oauth2', '~> 0.8.0' gem 'oauth2', '~> 0.8.0'
gem 'ruby-drupal-hash' gem 'ruby-drupal-hash'

10
Gemfile.lock
View File

@ -13,12 +13,6 @@ GIT
i18n-active_record (0.0.2) i18n-active_record (0.0.2)
i18n (>= 0.5.0) i18n (>= 0.5.0)
GIT
remote: https://github.com/codahale/bcrypt-ruby.git
revision: df09e4c73f2f3d9a134b2abf536ca5f159f33075
specs:
bcrypt-ruby (3.1.2)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
@ -52,6 +46,9 @@ GEM
arel (4.0.2) arel (4.0.2)
atomic (1.1.14) atomic (1.1.14)
awesome_print (1.2.0) 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) better_errors (1.1.0)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
@ -329,7 +326,6 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
acts_as_list acts_as_list
awesome_print awesome_print
bcrypt-ruby!
better_errors better_errors
binding_of_caller binding_of_caller
bullet bullet

2
config/routes.rb
View File

@ -38,7 +38,7 @@ BikeBike::Application.routes.draw do
end end
resources :users resources :users
#resources :user_sessions resources :user_sessions
#resources :organization_statuses #resources :organization_statuses