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

Merge branch '46991-unable-to-start-rails-console-if-using-master-from-gitlab-shell' into 'master'
539b2afd · Sean McGivern · ea5d35f6 · c5c5f18b · 539b2afd
Commit 539b2afd authored May 31, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

console_message.rb config/initializers/console_message.rb +2 -2

No files found.
--- 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