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
path: root/db
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-06-20 19:25:57 +0300
committerLin Jen-Shin <godfat@godfat.org>2016-06-20 19:25:57 +0300
commitd611074edd9c9129852a386ebcec9cc7b2f99a3c (patch)
treeb3fb7e21a93d5a3664816f0d9128969a9ea1fcb6 /db
parentaeb24ee87224e3be50001a486734ff4699e0e1af (diff)
parent032e398374b40d5b68c4a1ce89dd698f1d03a54c (diff)
Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project
* upstream/master: Add notification_settings:events to schema Fixed mobile styling Set path for pinned nav cookie Fixed placement of close button on merge requests using request dot path instead Turn note into normal text Document environments and deployments Tweak grammar fix double query string in url Broken instructions. git fetch --all --tags doesn't refresh tags
Diffstat (limited to 'db')
-rw-r--r--db/schema.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb
index d3312c65dcd..7a8377f687c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -710,6 +710,7 @@ ActiveRecord::Schema.define(version: 20160620115026) do
t.integer "level", default: 0, null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.text "events"
end
add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree