diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-08-02 16:37:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 16:37:09 -0400 |
| commit | c4a3118e9f885e92bb9b7d882898e9a51fc3be69 (patch) | |
| tree | 7564e7aa04e7c656781b34375d6964d029755c38 /webapp/components/integrations | |
| parent | e67bbcb0ae483cc86ae3a80ace36f1e6e663b589 (diff) | |
| download | chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.gz chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.bz2 chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.zip | |
PLT-3408 Add SiteURL to config.json (#3692)
* PLT-3408 Changed serverside code to get the service's URL from config.json
* PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location
* PLT-3408 Changed default SiteURL to be autodetected
Diffstat (limited to 'webapp/components/integrations')
| -rw-r--r-- | webapp/components/integrations/components/installed_incoming_webhook.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/integrations/components/installed_incoming_webhook.jsx b/webapp/components/integrations/components/installed_incoming_webhook.jsx index 2cf3f24b8..008000012 100644 --- a/webapp/components/integrations/components/installed_incoming_webhook.jsx +++ b/webapp/components/integrations/components/installed_incoming_webhook.jsx @@ -97,7 +97,7 @@ export default class InstalledIncomingWebhook extends React.Component { id='installed_integrations.url' defaultMessage='URL: {url}' values={{ - url: Utils.getWindowLocationOrigin() + '/hooks/' + incomingWebhook.id + url: window.mm_config.SiteURL + '/hooks/' + incomingWebhook.id }} /> </span> |