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

Merge pull request #4363 from cpradio/version-link-shows-compare 

FEATURE: Installed Version link shows GitHub Compare to branch being followed
This commit is contained in:
Régis Hanol 2016-08-03 16:03:57 +02:00 committed by GitHub
parent 323bd555c0 1b89c2f0ef
commit 35c13bca6c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/models/version-check.js.es6
View File

@ -24,8 +24,11 @@ const VersionCheck = Discourse.Model.extend({
}.property('missing_versions_count'),
gitLink: function() {
const git_branch = this.get('git_branch');
if (git_branch)
return "https://github.com/discourse/discourse/compare/" + this.get('installed_sha') + "..." + git_branch;
return "https://github.com/discourse/discourse/tree/" + this.get('installed_sha');
}.property('installed_sha'),
}.property('installed_sha', 'git_branch'),
shortSha: function() {
return this.get('installed_sha').substr(0,10);

2
app/models/discourse_version_check.rb
View File

@ -1,5 +1,5 @@
class DiscourseVersionCheck
include ActiveModel::Model
attr_accessor :latest_version, :critical_updates, :installed_version, :installed_sha, :installed_describe, :missing_versions_count, :updated_at, :version_check_pending
attr_accessor :latest_version, :critical_updates, :installed_version, :installed_sha, :installed_describe, :missing_versions_count, :git_branch, :updated_at, :version_check_pending
end

2
lib/discourse_updates.rb
View File

@ -8,6 +8,7 @@ module DiscourseUpdates
installed_version: Discourse::VERSION::STRING,
installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
installed_describe: `git describe --dirty`,
git_branch: Discourse.git_branch,
updated_at: nil
)
else
@ -18,6 +19,7 @@ module DiscourseUpdates
installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
installed_describe: `git describe --dirty`,
missing_versions_count: missing_versions_count,
git_branch: Discourse.git_branch,
updated_at: updated_at
)
end