Commit Graph

4208 Commits

Author SHA1 Message Date
Captain.B faf8c1f80f Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/api/router.js
#	frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
2020-12-04 17:57:00 +08:00
Captain.B 0abd7209e0 fix(性能测试): 修复多个线程组不能设置线程数的问题 2020-12-04 17:56:06 +08:00
Captain.B 7ee9522298 chore: 同步 submodule
(cherry picked from commit 9e62022ae9)
2020-12-04 17:35:53 +08:00
BugKing 25631ce05f Revert "chore: 同步 submodule"
This reverts commit 9e62022a
2020-12-04 15:53:21 +08:00
chenjianxing 45f791a4b1 refactor(测试跟踪): swagger 获取tag 2020-12-04 15:09:34 +08:00
chenjianxing 5b41a76935 fix(测试跟踪): 编辑用例报错 2020-12-04 10:55:51 +08:00
chenjianxing 897017be77 fix(接口测试): json结果自动格式化 2020-12-04 10:44:40 +08:00
chenjianxing 26119e21c7 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-12-04 10:43:13 +08:00
chenjianxing 4441824404 refactor(接口测试): 数据库接口表头可复制 fixes #679 2020-12-04 10:42:53 +08:00
BugKing 2c316439bc build: 修改 Dockerfile 基础镜像地址 2020-12-04 10:07:06 +08:00
BugKing 97448b39d5 build: 增加 action 2020-12-04 10:01:14 +08:00
BugKing bbcebb078e Merge branch 'v1.5-temp' into v1.5 2020-12-04 09:40:04 +08:00
chenjianxing e95efe4e41 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 21:14:02 +08:00
chenjianxing ec4ff14bf6 refactor: 处理swagger响应体 2020-12-03 21:13:53 +08:00
BugKing 504f47d4d4
build: checkout action 使用 token 2020-12-03 20:09:44 +08:00
BugKing 95381e91a6
build: 修改 submodule 获取方式 2020-12-03 19:57:16 +08:00
BugKing 57c720938d
build: action 中增加 submodule 更新步骤 2020-12-03 19:41:09 +08:00
fit2-zhao 1665a0f91a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:40:09 +08:00
fit2-zhao 97e3f91008 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:37:33 +08:00
BugKing 5ef0be5c8f
build: 更新 action 2020-12-03 19:37:06 +08:00
fit2-zhao 25238c2b32 feat(接口自动化): 完成场景引用和复制,接口的引用和复制 2020-12-03 19:36:43 +08:00
chenjianxing 02681ef715 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:36:15 +08:00
chenjianxing 5d37c09413 fix: 导入id和请求id一致 2020-12-03 19:36:08 +08:00
BugKing 9e6de725eb build: 更新 action 2020-12-03 19:18:08 +08:00
BugKing 0cd9fb7680 build: 修改 Dockerfile 基础镜像地址 2020-12-03 18:25:25 +08:00
BugKing 9e4082720e build: 更新 action 2020-12-03 18:15:40 +08:00
BugKing 71d11f0fb7 build: 更新 cache key & 修复变量引用 2020-12-03 17:34:01 +08:00
BugKing c8eda48a23 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2020-12-03 17:20:15 +08:00
BugKing 18a4602e62 build: 解决 Docker login 用户名为空的问题 2020-12-03 17:20:02 +08:00
Captain.B 403e72393c Merge remote-tracking branch 'origin/master' into master 2020-12-03 16:44:57 +08:00
Captain.B 882c1d3b17 refactor: 消息设置页面重构 2020-12-03 16:42:40 +08:00
chenjianxing 18d2d68486 refactor: 删除多余代码 2020-12-03 16:32:27 +08:00
chenjianxing f581a5626f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 16:28:35 +08:00
chenjianxing 3bd7a1d049 refactor(接口测试): swagger 导入重构造 2020-12-03 16:28:23 +08:00
chenjianxing fde6ae766c refactor(接口测试): swagger 导入重构 2020-12-03 16:27:00 +08:00
Captain.B 3ebec6a84a refactor: 消息设置滚动条设置 2020-12-03 16:17:52 +08:00
Captain.B dcf3a22bbf Merge remote-tracking branch 'origin/master' into master 2020-12-03 15:57:47 +08:00
Captain.B 3e00db1011 refactor: 重构发送通知的后台 2020-12-03 15:57:38 +08:00
Captain.B 30e3432d6d fix: 修复左上角的logo的样式 2020-12-03 15:23:20 +08:00
BugKing d59a05f806 build: GitHub action 使用缓存 2020-12-03 15:12:28 +08:00
shiziyuan9527 6630a22b8d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 14:46:10 +08:00
shiziyuan9527 d00d847e88 fix: 去掉sql分号 2020-12-03 14:45:55 +08:00
BugKing ad72116159
build: 增加 GitHub action 2020-12-03 14:41:42 +08:00
Captain.B bf13f09322 fix: 修复异步方法启动的问题 2020-12-03 14:08:04 +08:00
fit2-zhao ade3fe2043 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 13:50:53 +08:00
fit2-zhao c967e59511 feat(接口自动化): 完成场景自定义标签 2020-12-03 13:50:11 +08:00
Captain.B da6d7044e3 chore: Sync submodule 2020-12-03 13:27:10 +08:00
Captain.B f2d0f87724 Merge branch 'master' into notice-refactor 2020-12-03 12:50:41 +08:00
Captain.B 22a0a94613 refactor: 重构发送通知 2020-12-03 12:46:02 +08:00
fit2-zhao b7a472a08c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 19:23:05 +08:00