@ -11,3 +11,7 @@ config/settings/*.local.yml
config/environments/*.local.yml
config/settings.yml
public/assets
/spec/.views/
/spec/.requests/
/spec/.controllers/
/spec/.helpers/
@ -9,7 +9,7 @@ gem 'rails', '3.1.1'
gem 'mysql2'
gem 'devise', '~> 1.4.5'
gem 'cancan', '~> 1.6.5'
gem "squeel", "~> 0.9.3"
gem 'squeel', '~> 0.9.3'
gem 'sentient_user', '~> 0.3.2'
gem 'active_scaffold', '~> 3.1.0', :git => 'https://github.com/activescaffold/active_scaffold.git' # :path => '/home/clyfe/dev/active_scaffold'
gem 'pjax_rails', '~> 0.1.10'