Merge pull request #4742 from davidtaylorhq/patch-1

FIX: latest-version tag is shown by git-describe
This commit is contained in:
Sam 2017-03-08 08:51:50 -05:00 committed by GitHub
commit 9e9b497d20

View File

@ -7,7 +7,7 @@ module DiscourseUpdates
DiscourseVersionCheck.new(
installed_version: Discourse::VERSION::STRING,
installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
installed_describe: `git describe --dirty`,
installed_describe: `git describe --dirty --match "v[0-9]*"`,
git_branch: Discourse.git_branch,
updated_at: nil
)
@ -17,7 +17,7 @@ module DiscourseUpdates
critical_updates: critical_updates_available?,
installed_version: Discourse::VERSION::STRING,
installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
installed_describe: `git describe --dirty`,
installed_describe: `git describe --dirty --match "v[0-9]*"`,
missing_versions_count: missing_versions_count,
git_branch: Discourse.git_branch,
updated_at: updated_at