diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-25 13:32:49 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-25 13:32:49 +0000 |
| commit | cc570b6c44b69469ba675e2e66fc14808890201d (patch) | |
| tree | 93c296567b2503f30223566c44c62f1f6d13feea /config | |
| parent | f5e6300b8b916ce6a583b2344b4edb07945fd153 (diff) | |
| parent | d50a80a282b2ca145841774f4be154a977cccfd8 (diff) | |
| download | gitlab-ce-cc570b6c44b69469ba675e2e66fc14808890201d.tar.gz | |
Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'
Resolve "gitlab 10.8 assumes that installation is a git working copy."
Closes #46600
See merge request gitlab-org/gitlab-ce!19125
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/console_message.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sentry.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/console_message.rb b/config/initializers/console_message.rb index 536ab337d85..2c46a25f365 100644 --- a/config/initializers/console_message.rb +++ b/config/initializers/console_message.rb @@ -3,7 +3,7 @@ if defined?(Rails::Console) # note that this will not print out when using `spring` justify = 15 puts "-------------------------------------------------------------------------------------" - puts " Gitlab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab::REVISION})" + puts " Gitlab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision})" puts " Gitlab Shell:".ljust(justify) + Gitlab::Shell.new.version puts " #{Gitlab::Database.adapter_name}:".ljust(justify) + Gitlab::Database.version puts "-------------------------------------------------------------------------------------" diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index b2da3b3dc19..17d09293205 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -13,7 +13,7 @@ def configure_sentry if sentry_enabled Raven.configure do |config| config.dsn = Gitlab::CurrentSettings.current_application_settings.sentry_dsn - config.release = Gitlab::REVISION + config.release = Gitlab.revision # Sanitize fields based on those sanitized from Rails. config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s) |