Download as
Browse Code »

Commit 17befe2a2aa53540548c7cf547022b59e7893199

Authored by Dmitriy Zaporozhets
2 parents 3c91c581 5554eb16
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge pull request #6761 from jvanbaarsen/fixed-statemachine-warning 

Make the db and statemachine default is the same
Showing 2 changed files with 14 additions and 3 deletions   Show diff stats
db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb 0 → 100644
  Diff comments   View file @17befe2
... ... @@ -0,0 +1,11 @@
  1 +class ChangeStateToAllowEmptyMergeRequestDiffs < ActiveRecord::Migration
  2 + def up
  3 + change_column :merge_request_diffs, :state, :string, null: true,
  4 + default: nil
  5 + end
  6 +
  7 + def down
  8 + change_column :merge_request_diffs, :state, :string, null: false,
  9 + default: 'collected'
  10 + end
  11 +end
... ...
db/schema.rb
  Diff comments   View file @17befe2
... ... @@ -11,7 +11,7 @@
11 11 #
12 12 # It's strongly recommended that you check this file into your version control system.
13 13  
14   -ActiveRecord::Schema.define(version: 20140407135544) do
  14 +ActiveRecord::Schema.define(version: 20140414131055) do
15 15  
16 16 # These are extensions that must be enabled in order to support this database
17 17 enable_extension "plpgsql"
... ... @@ -109,10 +109,10 @@ ActiveRecord::Schema.define(version: 20140407135544) do
109 109 add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree
110 110  
111 111 create_table "merge_request_diffs", force: true do |t|
112   - t.string "state", default: "collected", null: false
  112 + t.string "state"
113 113 t.text "st_commits"
114 114 t.text "st_diffs"
115   - t.integer "merge_request_id", null: false
  115 + t.integer "merge_request_id", null: false
116 116 t.datetime "created_at"
117 117 t.datetime "updated_at"
118 118 end
... ...