Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-06 15:47:52 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-06 15:47:52 +0300
commit9cee280d7045d87a4c0854c0c281c98ba3a085e7 (patch)
treed65da90310054d83a81588a4886f11c88c59ca5c /db/schema.rb
parent2a18425e97023b05aa52c29dbce6c5a7aa7400b7 (diff)
parent66d03aae98cc0429d2ed75eac68025f447868479 (diff)
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb
index ce65ddaccc9..7c4a2b1d0bd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,7 +12,6 @@
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170404170532) do
-
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
enable_extension "pg_trgm"
@@ -919,6 +918,7 @@ ActiveRecord::Schema.define(version: 20170404170532) do
t.text "description_html"
t.boolean "only_allow_merge_if_all_discussions_are_resolved"
t.boolean "printing_merge_request_link_enabled", default: true, null: false
+ t.string "import_jid"
end
add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree