Merge branch 'master' into feature-file-templates
Conflicts: app/views/application/_navigation.html.slim config/locales/de.yml config/locales/en.yml db/schema.rb
This commit is contained in:
26
db/schema.rb
26
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: 20160610111602) 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: 20160610111602) 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
|
||||
@ -182,23 +181,16 @@ ActiveRecord::Schema.define(version: 20160610111602) 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
|
||||
t.integer "file_id", null: false
|
||||
t.datetime "requested_at"
|
||||
t.integer "user_id", null: false
|
||||
t.integer "exercise_id", null: false
|
||||
t.integer "file_id", null: false
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.string "user_type"
|
||||
t.text "question"
|
||||
t.boolean "solved"
|
||||
t.integer "submission_id"
|
||||
end
|
||||
|
||||
create_table "submissions", force: true do |t|
|
||||
@ -211,12 +203,6 @@ ActiveRecord::Schema.define(version: 20160610111602) 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"
|
||||
|
Reference in New Issue
Block a user