diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-31 08:31:36 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-31 08:31:36 +0000 |
| commit | 539b2afd051e1891e946356420705bb37bb858a4 (patch) | |
| tree | f193ce4ecd250847f735926330fc1cfafa57dbbb | |
| parent | ea5d35f6722a5027f919eba061a38b1b5be4a85a (diff) | |
| parent | c5c5f18b93b2edcd9567fa2fb43a6e5bf2959140 (diff) | |
| download | gitlab-ce-539b2afd051e1891e946356420705bb37bb858a4.tar.gz | |
Merge branch '46991-unable-to-start-rails-console-if-using-master-from-gitlab-shell' into 'master'
Resolve "Unable to start rails console if using master from gitlab-shell"
Closes #46991
See merge request gitlab-org/gitlab-ce!19251
| -rw-r--r-- | config/initializers/console_message.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/console_message.rb b/config/initializers/console_message.rb index 2c46a25f365..f7c26732e6d 100644 --- a/config/initializers/console_message.rb +++ b/config/initializers/console_message.rb @@ -3,8 +3,8 @@ 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 Shell:".ljust(justify) + Gitlab::Shell.new.version + puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision})" + puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}" puts " #{Gitlab::Database.adapter_name}:".ljust(justify) + Gitlab::Database.version puts "-------------------------------------------------------------------------------------" end |