通过
6 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at baa5787 修改百度搜索标题
From http://114.215.101.231:8099/root/liepin
baa5787..68ecc14 master -> origin/master
Checking out 68ecc14a as master...
Skipping Git submodules setup
$ cd /alidata/www/online/chinacrossing.cn
$ git pull
From http://114.215.101.231:8099/root/liepin
baa5787..68ecc14 master -> origin/master
Auto-merging public/assets/js/backend/custom.js
Merge made by the 'recursive' strategy.
application/admin/controller/Custom.php | 2 +-
application/admin/lang/zh-cn/custom.php | 1 +
application/admin/view/custom/add.html | 6 ++++++
application/admin/view/custom/edit.html | 6 ++++++
application/index/controller/Index.php | 3 ++-
public/assets/js/backend/custom.js | 1 +
6 files changed, 17 insertions(+), 2 deletions(-)
Build succeeded