gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into indentation_fix

Browse source
This commit is contained in:
Stella Rouzi 2017-07-14 12:40:32 +03:00 • committed by GitHub
commit ab773c74c3
28 changed files with 1214 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
db/migrate/20170705075039_add_state_cfp_active_and_submitter_reference_to_tracks.rb Normal file
View file

@ -0,0 +1,8 @@
class AddStateCfpActiveAndSubmitterReferenceToTracks < ActiveRecord::Migration
def change
add_column :tracks, :state, :string
add_column :tracks, :cfp_active, :boolean
add_column :tracks, :submitter_id, :integer
add_index :tracks, :submitter_id
end
end

11
db/schema.rb
View file

@ -483,16 +483,21 @@ ActiveRecord::Schema.define(version: 20170711102511) do
end
create_table "tracks", force: :cascade do |t|
t.string "guid", null: false
t.string "name", null: false
t.string "guid", null: false
t.string "name", null: false
t.text "description"
t.string "color"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "program_id"
t.string "short_name", null: false
t.string "short_name", null: false
t.string "state"
t.boolean "cfp_active"
t.integer "submitter_id"
end
add_index "tracks", ["submitter_id"], name: "index_tracks_on_submitter_id"
create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false