summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-01-06 17:49:02 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2016-01-06 17:49:56 +0100
commit8fdc00bd4c59183a20a60a6b93228268230bbd2e (patch)
tree0c5c81a3799c66acf6250393ee43f9fb9b2f1b24 /db
parentbcd2a09da72d430773b4b4bbc700132aade641d7 (diff)
downloadgitlab-ce-8fdc00bd4c59183a20a60a6b93228268230bbd2e.tar.gz
Remove InfluxDB username/passwordremove-influxdb-credentials
InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20160106164438_remove_influxdb_credentials.rb6
-rw-r--r--db/schema.rb20
2 files changed, 15 insertions, 11 deletions
diff --git a/db/migrate/20160106164438_remove_influxdb_credentials.rb b/db/migrate/20160106164438_remove_influxdb_credentials.rb
new file mode 100644
index 00000000000..47e74400b97
--- /dev/null
+++ b/db/migrate/20160106164438_remove_influxdb_credentials.rb
@@ -0,0 +1,6 @@
+class RemoveInfluxdbCredentials < ActiveRecord::Migration
+ def change
+ remove_column :application_settings, :metrics_username, :string
+ remove_column :application_settings, :metrics_password, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 48e6983684a..2ded8a45e18 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20151229112614) do
+ActiveRecord::Schema.define(version: 20160106164438) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -50,16 +50,14 @@ ActiveRecord::Schema.define(version: 20151229112614) do
t.boolean "shared_runners_enabled", default: true, null: false
t.integer "max_artifacts_size", default: 100, null: false
t.string "runners_registration_token"
- t.boolean "require_two_factor_authentication", default: false
- t.integer "two_factor_grace_period", default: 48
- t.boolean "metrics_enabled", default: false
- t.string "metrics_host", default: "localhost"
- t.string "metrics_username"
- t.string "metrics_password"
- t.integer "metrics_pool_size", default: 16
- t.integer "metrics_timeout", default: 10
- t.integer "metrics_method_call_threshold", default: 10
- t.boolean "recaptcha_enabled", default: false
+ t.boolean "require_two_factor_authentication", default: false
+ t.integer "two_factor_grace_period", default: 48
+ t.boolean "metrics_enabled", default: false
+ t.string "metrics_host", default: "localhost"
+ t.integer "metrics_pool_size", default: 16
+ t.integer "metrics_timeout", default: 10
+ t.integer "metrics_method_call_threshold", default: 10
+ t.boolean "recaptcha_enabled", default: false
t.string "recaptcha_site_key"
t.string "recaptcha_private_key"
t.integer "metrics_port", default: 8089