Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'heroku' of github.com:Bushido/Kandan into heroku

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
  • Loading branch information...
commit bd01552244d6e8b8615cbc10b3c3b607731a2426 2 parents c21ed2b + cdef471
@sgrove sgrove authored
View
14 Gemfile
@@ -31,12 +31,12 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
-#gem 'tane', :path => "/remote/tane", :group => :development
+# gem 'tane', :path => "/remote/tane", :group => :development
# Test gems, obviously
-group :test do
- gem 'rspec-rails'
- gem 'shoulda-matchers'
- gem 'factory_girl_rails'
- # gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test]
-end
+# group :test do
+# gem 'rspec-rails'
+# gem 'shoulda-matchers'
+# gem 'factory_girl_rails'
+# gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test]
+# end
View
23 Gemfile.lock
@@ -70,7 +70,6 @@ GEM
devise_bushido_authenticatable (1.0.3)
devise (= 1.5.3)
rubycas-client (>= 2.2.1)
- diff-lcs (1.1.3)
eco (1.0.0)
coffee-script
eco-source
@@ -85,11 +84,6 @@ GEM
eventmachine (0.12.10)
execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.6.1)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.7.0)
- factory_girl (~> 2.6.0)
- railties (>= 3.0.0)
highline (1.6.11)
hike (1.2.1)
httparty (0.8.1)
@@ -149,19 +143,6 @@ GEM
remotipart (1.0.2)
rest-client (1.6.7)
mime-types (>= 1.16)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
- rspec-rails (2.8.1)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.8.0)
rubycas-client (2.3.8)
activesupport
sass (3.1.15)
@@ -169,7 +150,6 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- shoulda-matchers (1.0.0)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
@@ -205,15 +185,12 @@ DEPENDENCIES
devise_bushido_authenticatable
eco
execjs
- factory_girl_rails
jquery-rails
kaminari
paperclip
pg
rails (= 3.2.2)
remotipart
- rspec-rails
sass-rails (~> 3.2.3)
- shoulda-matchers
thin
uglifier (>= 1.0.3)
View
2  app/models/user.rb
@@ -4,13 +4,13 @@ class User < ActiveRecord::Base
before_save :ensure_authentication_token
before_save :ensure_gravatar_hash
+
# Kandan.devise_modules is defined in config/initializers/kandan.rb
devise devise *Kandan.devise_modules
# Setup accessible (or protected) attributes for your model
attr_accessible :id, :email, :password, :password_confirmation, :remember_me, :first_name, :last_name, :locale, :gravatar_hash
-
def bushido_extra_attributes(extra_attributes)
self.first_name = extra_attributes["first_name"].to_s
self.last_name = extra_attributes["last_name"].to_s
View
2  config/application.rb
@@ -26,6 +26,8 @@ class Application < Rails::Application
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
+ config.assets.initialize_on_precompile = false
+
# Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras)
View
0  vendor/plugins/.gitkeep
No changes.
Please sign in to comment.
Something went wrong with that request. Please try again.