summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/light_settings.rb2
-rw-r--r--config/locales/en.yml3
2 files changed, 4 insertions, 1 deletions
diff --git a/config/light_settings.rb b/config/light_settings.rb
index aa0dd04b3fa..19343ba7de0 100644
--- a/config/light_settings.rb
+++ b/config/light_settings.rb
@@ -22,7 +22,7 @@ class LightSettings
end
def host
- config['gitlab']['host']
+ config.dig('gitlab', 'host') || ENV['GITLAB_HOST'] || 'localhost'
end
def gl_subdomain?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a60f86e1d80..eff015459e3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -16,6 +16,9 @@ en:
api_url: "Sentry API URL"
project/metrics_setting:
external_dashboard_url: "External dashboard URL"
+ project/grafana_integration:
+ token: "Grafana HTTP API Token"
+ grafana_url: "Grafana API URL"
views:
pagination:
previous: "Prev"