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

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