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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-20 17:34:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-20 17:34:42 +0300
commit9f46488805e86b1bc341ea1620b866016c2ce5ed (patch)
treef9748c7e287041e37d6da49e0a29c9511dc34768 /db/migrate/20190624123615_add_grafana_url_to_settings.rb
parentdfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff)
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'db/migrate/20190624123615_add_grafana_url_to_settings.rb')
-rw-r--r--db/migrate/20190624123615_add_grafana_url_to_settings.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/db/migrate/20190624123615_add_grafana_url_to_settings.rb b/db/migrate/20190624123615_add_grafana_url_to_settings.rb
index 835ec4e9094..f10014872e9 100644
--- a/db/migrate/20190624123615_add_grafana_url_to_settings.rb
+++ b/db/migrate/20190624123615_add_grafana_url_to_settings.rb
@@ -7,12 +7,12 @@ class AddGrafanaUrlToSettings < ActiveRecord::Migration[5.1]
DOWNTIME = false
+ # rubocop:disable Migration/PreventStrings
def up
- # rubocop:disable Migration/AddLimitToStringColumns
- add_column_with_default(:application_settings, :grafana_url, :string,
+ add_column_with_default(:application_settings, :grafana_url, :string, # rubocop:disable Migration/AddColumnWithDefault
default: '/-/grafana', allow_null: false)
- # rubocop:enable Migration/AddLimitToStringColumns
end
+ # rubocop:enable Migration/PreventStrings
def down
remove_column(:application_settings, :grafana_url)