cleaner database.yml

.gitignore

@@ -68,4 +68,5 @@ brakeman.html
 # Ignore sensitive data
 /config/settings/local.rb
 /nbproject/private/
+<<<<<<< HEAD
 /config/database.yml

config/application.rb

@@ -26,7 +26,7 @@ module BikeBike
 		# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
 		config.i18n.default_locale = :en #:de
 		config.i18n.enforce_available_locales = false
-		self.paths['config/database'] = Rails.root.parent.join("secure/database.yml").to_s
+		self.paths['config/database'] = Rails.root.parent.join('BikeBike', 'config', 'database.yml')
 		# config.action_controller.default_url_options = { :trailing_slash => true }
 		#config.middleware.swap 'Rack::MethodOverride', 'Rack::MethodOverrideWithParams'
 		#config.i18n.exception_handler = I18n::MissingTranslationExceptionHandler.new

config/database.yml.example

@@ -56,3 +56,4 @@ production:
 
 cucumber:
   <<: *test
+

config/database.yml.example~cleaner-db

@@ -0,0 +1,33 @@
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: bike_bike_dev
+  username: bike_bike
+  password: admin
+  host: 127.0.0.1
+  port: 5432
+  pool: 5
+
+
+test: &test
+  adapter: postgresql
+  encoding: unicode
+  database: bike_bike_test
+  username: bike_bike
+  password: admmin
+  host: 127.0.0.1
+  port: 5432
+  pool: 5
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: bike_bike
+  username: bike_bike
+  password: admin
+  host: 127.0.0.1
+  port: 5432
+  pool: 5
+
+cucumber:
+  <<: *test

db/schema.rb

@@ -213,8 +213,8 @@ ActiveRecord::Schema.define(version: 20140725001300) do
   end
 
   create_table "user_organization_relationships", force: true do |t|
-    t.integer  "user_id",         null: false
-    t.integer  "organization_id", null: false
+    t.integer  "user_id"
+    t.integer  "organization_id"
     t.string   "relationship"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -256,7 +256,7 @@ ActiveRecord::Schema.define(version: 20140725001300) do
     t.string   "whodunnit"
     t.text     "object"
     t.datetime "created_at"
-    t.text     "value"
+    t.string   "value"
   end
 
   create_table "workshop_facilitators", force: true do |t|