Merge pull request #1289 from ZogStriP/fix-git-version

fix: git-version isn't showing up
2013-08-02 14:29:53 -07:00 · 2013-08-02 14:29:53 -07:00 · d4343487e6
parent f996a8757a 4ec9b3ea39
commit d4343487e6
1 changed files with 3 additions and 1 deletions
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@ -105,7 +105,9 @@ module Discourse

  def self.git_version
    return $git_version if $git_version
-    f = Rails.root.to_s + "/lib/version"
+
+    # load the version stamped by the "build:stamp" task
+    f = Rails.root.to_s + "/config/version"
    require f if File.exists?("#{f}.rb")

    begin