kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge RocketBot UI as primary UI (#2515) 

* Remove old UI submodule.

* Add rocketbot UI as submodule.

* update skywalking-rocketbot-ui commitId.

* Update ignore.
This commit is contained in:
吴晟 Wu Sheng 2019-04-25 12:34:36 +08:00 committed by Jared Tan
parent 4e50bcf094
commit 5321a8538d
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,9 +1,9 @@
[submodule "skywalking-ui"]
path = skywalking-ui
url = https://github.com/apache/incubator-skywalking-ui
[submodule "apm-protocol/apm-network/src/main/proto"]
path = apm-protocol/apm-network/src/main/proto
url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git
[submodule "oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol"]
path = oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
url = https://github.com/apache/incubator-skywalking-query-protocol.git
[submodule "skywalking-ui"]
path = skywalking-ui
url = https://github.com/apache/skywalking-rocketbot-ui.git

14
pom.xml
View File

@ -318,18 +318,8 @@
<!-- UI IDE configs -->
<exclude>**/skywalking-ui/.editorconfig</exclude>
<!-- UI Compiler configs -->
<exclude>**/skywalking-ui/.webpackrc.js</exclude>
<exclude>**/skywalking-ui/.roadhogrc.mock.js</exclude>
<!-- UI Test configs -->
<exclude>**/skywalking-ui/jest.config.js</exclude>
<!-- UI style check files -->
<exclude>**/skywalking-ui/.eslintrc.js</exclude>
<exclude>**/skywalking-ui/.stylelintrc</exclude>
<exclude>**/skywalking-ui/.prettierignore</exclude>
<exclude>**/skywalking-ui/.prettierrc</exclude>
<!-- UI icon files -->
<exclude>**/skywalking-ui/public/font/iconfont/**</exclude>
<!-- UI ignore -->
<exclude>**/skywalking-ui/.browserslistrc</exclude>
<!-- git files -->
<exclude>**/.gitignore</exclude>

2
skywalking-ui

@ -1 +1 @@
Subproject commit 949e43436a652acb213a18feda73125ae8a7c0df
Subproject commit 49595692ed8fae2e3d9e931cc34f4c350f6973e2