diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-11-23 20:21:51 +0100 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-11-23 23:33:02 +0100 |
| commit | ad185e623b282f622ca3ea983840eed44a664fcb (patch) | |
| tree | 3cfa2021a25ab130c6da6a2e88e2c2e24886884e | |
| parent | 0051b5fbcc3154dacf20b1e89387b9ea55827266 (diff) | |
| download | gitlab-ce-ad185e623b282f622ca3ea983840eed44a664fcb.tar.gz | |
add missing schema entry and application settigns helper
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 1 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index e5d2693b01e..f776cd31438 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -211,6 +211,7 @@ module ApplicationSettingsHelper :polling_interval_multiplier, :project_export_enabled, :prometheus_metrics_enabled, + :prometheus_metrics_method_instrumentation_enabled, :recaptcha_enabled, :recaptcha_private_key, :recaptcha_site_key, diff --git a/db/schema.rb b/db/schema.rb index a82270390f1..48afc475209 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: 20171121144800) do +ActiveRecord::Schema.define(version: 20171122211913) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -149,6 +149,7 @@ ActiveRecord::Schema.define(version: 20171121144800) do t.boolean "throttle_authenticated_web_enabled", default: false, null: false t.integer "throttle_authenticated_web_requests_per_period", default: 7200, null: false t.integer "throttle_authenticated_web_period_in_seconds", default: 3600, null: false + t.boolean "prometheus_metrics_method_instrumentation_enabled", default: false, null: false end create_table "audit_events", force: :cascade do |t| |