Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: latest-version tag is shown by git-describe 

Adds the -match "v[0-9]*" parameter to git describe, this means that only version tags will be used.
This commit is contained in:
David Taylor 2017-03-08 11:05:11 +00:00 committed by GitHub
parent 801b5838e1
commit 6fd34cede6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/discourse_updates.rb
View File

@ -7,7 +7,7 @@ module DiscourseUpdates
DiscourseVersionCheck.new( DiscourseVersionCheck.new(
installed_version: Discourse::VERSION::STRING, installed_version: Discourse::VERSION::STRING,
installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version), 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, git_branch: Discourse.git_branch,
updated_at: nil updated_at: nil
) )
@ -17,7 +17,7 @@ module DiscourseUpdates
critical_updates: critical_updates_available?, critical_updates: critical_updates_available?,
installed_version: Discourse::VERSION::STRING, installed_version: Discourse::VERSION::STRING,
installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version), 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, missing_versions_count: missing_versions_count,
git_branch: Discourse.git_branch, git_branch: Discourse.git_branch,
updated_at: updated_at updated_at: updated_at