Skip to content

Commit

Permalink
Point to external profile image and bump version to 0.9.1 (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
jwilander authored Apr 9, 2019
1 parent 61b26b9 commit dbc90c3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "github",
"name": "GitHub",
"description": "GitHub plugin for Mattermost.",
"version": "0.9.0",
"version": "0.9.1",
"server": {
"executables": {
"linux-amd64": "server/dist/plugin-linux-amd64",
Expand Down
5 changes: 3 additions & 2 deletions server/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main

import (
"fmt"
"path"
"reflect"

"github.com/mattermost/mattermost-server/model"
Expand Down Expand Up @@ -105,7 +104,9 @@ func (p *Plugin) setConfiguration(configuration *configuration, serverConfigurat
configuration.PluginsDirectory = *serverConfiguration.PluginSettings.Directory
}
if serverConfiguration.ServiceSettings.SiteURL != nil {
configuration.ProfileImageURL = path.Join(*serverConfiguration.ServiceSettings.SiteURL, "plugins", manifest.Id, "assets", "profile.png")
// Temporary patch until issue with image proxy is solved
configuration.ProfileImageURL = "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"
//configuration.ProfileImageURL = path.Join(*serverConfiguration.ServiceSettings.SiteURL, "plugins", manifest.Id, "assets", "profile.png")
}

p.configuration = configuration
Expand Down
2 changes: 1 addition & 1 deletion server/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ var manifest = struct {
Version string
}{
Id: "github",
Version: "0.9.0",
Version: "0.9.1",
}
2 changes: 1 addition & 1 deletion webapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "github",
"version": "0.7.1",
"version": "0.9.1",
"description": "Github plugin for Mattermost",
"main": "src/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/manifest.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const id = 'github';
export const version = '0.9.0';
export const version = '0.9.1';

0 comments on commit dbc90c3

Please sign in to comment.