通过
3 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at f0df3c8 修改bug，增加不同图片尺寸
From http://114.215.101.231:8099/jinglong/xingqiu
f0df3c8..f736d9d master -> origin/master
Checking out f736d9d5 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xingqiu
$ git pull
From http://114.215.101.231:8099/jinglong/xingqiu
f0df3c8..f736d9d master -> origin/master
Updating f0df3c8..f736d9d
Fast-forward
app/portal/controller/EnjoyController.php | 1 +
app/portal/controller/IndexController.php | 39 ++++++++++++++++++
app/portal/model/CityCategoryModel.php | 1 +
.../portal/admin_city_category/add.html | 14 +++++++
.../portal/admin_city_category/edit.html | 14 +++++++
.../portal/admin_city_category/index.html | 16 ++++++++
.../portal/active/get_active_detail.html | 2 +-
public/themes/simpleboot3/portal/enjoy/index.html | 2 +-
public/themes/simpleboot3/portal/enjoy_detail.html | 2 +-
public/themes/simpleboot3/portal/index/index.html | 21 +++++++---
.../portal/region/get_future_detail.html | 2 +-
.../simpleboot3/portal/region/get_more_video.html | 46 ++++++++++++----------
.../simpleboot3/portal/region/get_news_detail.html | 2 +-
.../simpleboot3/portal/region/get_note_detail.html | 2 +-
.../simpleboot3/portal/region/get_star_detail.html | 2 +-
.../simpleboot3/portal/star/get_food_detail.html | 2 +-
.../portal/star/get_scenery_detail.html | 2 +-
.../simpleboot3/portal/star/get_story_detail.html | 2 +-
.../themes/simpleboot3/public/assets/css/mask.css | 14 +++----
.../themes/simpleboot3/public/assets/js/public.js | 2 +-
20 files changed, 144 insertions(+), 44 deletions(-)
Build succeeded