Merge pull request #21 from adityashedge/master

fix for seeds and bootstrap css
tekvision · Apr 4, 2014 · b94ddd3 · b94ddd3
2 parents f94896a + 38b77ff
commit b94ddd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/stylesheets/framework_and_overrides.css.scss b/app/assets/stylesheets/framework_and_overrides.css.scss
@@ -1,5 +1,5 @@
 // import the CSS framework
-@import "bootstrap";
+//@import "bootstrap";
 
 // make all images responsive by default
 img {

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -8,7 +8,7 @@
 
 User.destroy_all
 
-user = User.create(email: 'gerson@example.com', password: 'josh1234', roles: 'admin')
+user = User.create(email: 'gerson@example.com', password: 'josh1234', roles: ['admin'])
 user.profile = Profile.create(name: "gerson", birthdate: "19/07/1989", gender: "male", address: "kdjasldjaskjd", country: "Brazil" )
 user.save!