merge master

db/migrate/20160704143402_remove_teams.rb

@@ -0,0 +1,7 @@
+class RemoveTeams < ActiveRecord::Migration
+  def change
+    remove_reference :exercises, :team
+    drop_table :teams
+    drop_table :internal_users_teams
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160630154310) do
+ActiveRecord::Schema.define(version: 20160704143402) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -87,7 +87,6 @@ ActiveRecord::Schema.define(version: 20160630154310) do
     t.boolean  "public"
     t.string   "user_type"
     t.string   "token"
-    t.integer  "team_id"
     t.boolean  "hide_file_tree"
     t.boolean  "allow_file_creation"
   end
@@ -173,14 +172,6 @@ ActiveRecord::Schema.define(version: 20160630154310) do
   add_index "internal_users", ["remember_me_token"], name: "index_internal_users_on_remember_me_token", using: :btree
   add_index "internal_users", ["reset_password_token"], name: "index_internal_users_on_reset_password_token", using: :btree
 
-  create_table "internal_users_teams", force: true do |t|
-    t.integer "internal_user_id"
-    t.integer "team_id"
-  end
-
-  add_index "internal_users_teams", ["internal_user_id"], name: "index_internal_users_teams_on_internal_user_id", using: :btree
-  add_index "internal_users_teams", ["team_id"], name: "index_internal_users_teams_on_team_id", using: :btree
-
   create_table "request_for_comments", force: true do |t|
     t.integer  "user_id",      null: false
     t.integer  "exercise_id",  null: false
@@ -204,12 +195,6 @@ ActiveRecord::Schema.define(version: 20160630154310) do
     t.string   "user_type"
   end
 
-  create_table "teams", force: true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "testruns", force: true do |t|
     t.boolean  "passed"
     t.text     "output"

db/seeds/development.rb

@@ -22,6 +22,3 @@ Hint.create_factories
 
 # submissions
 FactoryGirl.create(:submission, exercise: @exercises[:fibonacci])
-
-# teams
-FactoryGirl.create(:team, internal_users: InternalUser.limit(10))