From 65817e13c7900ea81947e40e177459cfea8acee4 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Wed, 2 Aug 2017 01:36:54 -0700
Subject: PLT-6965 jira integration (plus plugin scaffolding) (#6918)

* plugin scaffolding / jira integration

* add vendored testify packages

* webhook fix

* don't change i18n ids

* support configuration watching

* add basic jira plugin configuration to admin console

* fix eslint errors

* fix another eslint warning

* polish

* undo unintentional config.json commit >:(

* test fix

* add jira plugin diagnostics, remove dm support, add bot tag, generate web-safe secrets

* rebase, implement requested changes

* requested changes

* remove tests and minimize makefile change

* add missing license headers

* add missing comma

* remove bad line from Makefile
---
 webapp/routes/route_admin_console.jsx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'webapp/routes')

diff --git a/webapp/routes/route_admin_console.jsx b/webapp/routes/route_admin_console.jsx
index 17e0290c2..15081a1d9 100644
--- a/webapp/routes/route_admin_console.jsx
+++ b/webapp/routes/route_admin_console.jsx
@@ -46,6 +46,7 @@ import LicenseSettings from 'components/admin_console/license_settings.jsx';
 import Audits from 'components/admin_console/audits';
 import Logs from 'components/admin_console/server_logs';
 import ElasticsearchSettings from 'components/admin_console/elasticsearch_settings.jsx';
+import JIRASettings from 'plugins/jira/components/settings.jsx';
 
 export default (
     <Route>
@@ -159,6 +160,10 @@ export default (
                 path='webrtc'
                 component={WebrtcSettings}
             />
+            <Route
+                path='jira'
+                component={JIRASettings}
+            />
         </Route>
         <Route path='files'>
             <IndexRedirect to='storage'/>
-- 
cgit v1.2.3-1-g7c22