Print the version, use correct tag.

GITLAB_SHELL_VERSION

-2.6.9.pre
+v2.6.9.pre

GITLAB_VERSION

-8.3.0.pre
+v8.3.0.pre

config/software/gitlab-rails.rb

@@ -15,10 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version = Gitlab::Version.new("GITLAB_VERSION")
+require "#{Omnibus::Config.project_root}/lib/gitlab/version"
+version = Gitlab::Version.new("GITLAB_VERSION").print
 name "gitlab-rails"
-default_version "v#{version}"
+default_version version
 EE = system("#{Omnibus::Config.project_root}/support/is_gitlab_ee.sh")

config/software/gitlab-shell.rb

@@ -15,10 +15,11 @@
 ## limitations under the License.
 ##
 #
-version = Gitlab::Version.new("GITLAB_SHELL_VERSION")
+require "#{Omnibus::Config.project_root}/lib/gitlab/version"
+version = Gitlab::Version.new("GITLAB_SHELL_VERSION").print
 name "gitlab-shell"
-default_version "v#{version}"
+default_version version
 dependency "ruby"
 dependency "rsync"

config/software/gitlab-workhorse.rb

@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version = Gitlab::Version.new("GITLAB_WORKHORSE_VERSION")
+require "#{Omnibus::Config.project_root}/lib/gitlab/version"
+version = Gitlab::Version.new("GITLAB_WORKHORSE_VERSION").print
 name "gitlab-workhorse"
 default_version version

lib/gitlab/version.rb

@@ -10,7 +10,7 @@ module Gitlab
       @read_version = ""
     end
-    def version
+    def print
       if @read_version.include?('.pre')
         "master"
       elsif @read_version.empty?