mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-19 01:26:08 +10:00
Merge branch 'fix-rebase-checkbox' into 'master'
Fix rebase checkbox For #229 See merge request !320
This commit is contained in:
@@ -1,5 +0,0 @@
|
||||
class ChangeRebaseProjectSettingToFalse < ActiveRecord::Migration
|
||||
def change
|
||||
change_column :projects, :merge_requests_rebase_default, :boolean, default: false
|
||||
end
|
||||
end
|
||||
+2
-2
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20150217001826) do
|
||||
ActiveRecord::Schema.define(version: 20150213121042) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
@@ -398,7 +398,7 @@ ActiveRecord::Schema.define(version: 20150217001826) do
|
||||
t.boolean "merge_requests_rebase_enabled", default: false
|
||||
t.string "import_type"
|
||||
t.string "import_source"
|
||||
t.boolean "merge_requests_rebase_default", default: false
|
||||
t.boolean "merge_requests_rebase_default", default: true
|
||||
end
|
||||
|
||||
add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree
|
||||
|
||||
Reference in New Issue
Block a user