• This project
    • Loading...
  • Sign in

fe / yohobuywap-node · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Closed
Merge Request !644 opened 2017-06-08 08:50:29 UTC by石坚@shijian

Feature/seo tdk

Edited 2017-06-21 06:12:29 UTC
Request to merge feature/seoTDK into gray
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/seoTDK origin/feature/seoTDK

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout gray
git merge --no-ff feature/seoTDK

Step 4. Push the result of the merge to GitLab

git push origin gray

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

Closed by 毕凯 2017-06-21 06:12:28 UTC

The changes were not merged into gray.

  • Discussion 0
  • Commits 160
  • Changes 113
  • 石坚
    @shijian 2017-06-09 05:36:23 UTC

    Added 1 commit:

    • c3fc0033 - 中间件
  • 周少峰
    @zhoushaofeng 2017-06-15 05:53:24 UTC
    Master

    Added 157 commits:

    • 200da968 - comments
    • 3590003a - dev-api
    • f76437f7 - 推荐店铺优化
    • fb831246 - frame
    • 5992d20f - merge-master
    • 13cb0298 - comments-layout-ok
    • f205c1f2 - top-article
    • 4115aeae - 购物车页 加价购 赠品
    • 15d08dde - del-all-handle
    • ab065a06 - scroll-4-safari5
    • 64f4bea9 - scroll-4-safari5
    • 68f5984a - 结算页
    • 8cc6f9dc - 开发完成
    • 9fca7f71 - video
    • b5402da3 - video
    • cf74b4fe - labels
    • ef1d66e3 - tag
    • 937a7f92 - address4-tip
    • c3cd8702 - global
    • 1313155c - video-global
    • 33485c5a - top-left
    • 4e717ee7 - 订单详情、列表
    • 4d4a4aed - Merge branch 'master' into release/5.8
    • 038b78ae - 订单样式
    • 0efd82e9 - comments-data-style
    • 47878ca3 - scroll-modified
    • eb299453 - time
    • 8b475e40 - 个性化券展示
    • 010eaf3d - province-color-red
    • b4deffd3 - 确认订单页遮盖
    • 2eee3cb9 - Merge branch 'master' into feature/promotionV2
    • 46f32e03 - 个性化券 前端修改
    • 81780676 - 去除调试数据
    • d9a8ca88 - 销量排序
    • 1f4cc560 - 销量排序
    • 4c3c7fb9 - Merge branch 'feature/promotionV2' into 'release/5.8'
    • 1076407e - praise-data
    • 55eea997 - 分期帮助中心取接口数据
    • fd830d78 - 去注释代码
    • 5828729d - data-undefined
    • 394ca4a8 - 结算页去除会员、学生标识
    • b0022bf8 - 去除订单列表和订单详情页的VIP、学生标识
    • 036105fa - Merge branch 'master' into feature/guang2
    • b502ee60 - Merge branch 'feature/guang2' into 'release/5.8'
    • a2d832e1 - 升级依赖
    • 17bd18ee - global
    • b716b2af - Merge branch 'feature/guang2' into 'release/5.8'
    • 9fc1b752 - goods-limit
    • 90993f5c - Merge branch 'feature/installment' into 'release/5.8'
    • a2345c77 - Merge branch 'feature/guang2' into 'release/5.8'
    • 30d9260f - comments
    • 5f48e9d8 - Merge branch 'feature/guang2' into 'release/5.8'
    • 1fdb07f4 - Merge branch 'master' into feature/address4
    • 7d23d540 - singleApi
    • 7f2c46b4 - Merge branch 'feature/address4' into 'release/5.8'
    • 627e8936 - video-category-id
    • 4b7642b4 - Merge branch 'feature/guang2' into 'release/5.8'
    • 211af89c - global-goods
    • ee5e515f - Merge branch 'feature/guang2' into release/5.8
    • 90f34f52 - global-cart-handle
    • b431d8c4 - global-cart-handle
    • e39ab7c3 - overflow
    • 6b4dcd43 - Merge branch 'feature/guang2' into release/5.8
    • 5006c734 - 隐藏吊牌价,加载首屏数据
    • b9d503ee - 隐藏吊牌价,加载首屏数据
    • de7957b8 - Merge branch 'feature/promotionV2' into 'release/5.8'
    • eab5c248 - recomandLi
    • 87af0858 - recomandLi
    • cd6c94f7 - Merge branch 'feature/guang2' into release/5.8
    • 362bd943 - 首屏为24
    • 7fd01236 - 埋点
    • 45ad0db3 - goods_type
    • 01f82816 - 结算页赠品 加价购
    • 6b8e511a - goods_price
    • 1a82b9b6 - 样式和字段修改
    • 6a03eccc - isLimitbuy
    • deaf9e71 - Merge branch 'feature/guang2' into release/5.8
    • a903ce18 - 第一屏
    • 619a70bd - 开发完成
    • a7d4be19 - 开发完成
    • abf95b10 - 默认 人气筛选
    • 98f232cf - Merge branch 'feature/orderApportion' into 'release/5.8'
    • 7a4c6535 - 商品埋点修改
    • 17cfaa9e - 模版化,按钮优化等
    • e070586f - 首屏小于12个
    • 51c8e5ef - 相对地址,模版兼容skn
    • 1905d20d - 正在加载
    • b19b562e - 正在加载
    • 462954b3 - 正在加载
    • 71238eb9 - 插入位置
    • ac615873 - Merge branch 'feature/recommendShop' into 'release/5.8'
    • c6f1de17 - Merge branch 'feature/similar' into 'release/5.8'
    • 06efc7aa - Merge branch 'feature/listFist' into 'release/5.8'
    • 3a09691f - Merge branch 'release/5.8' of git.yoho.cn:fe/yohobuywap-node into release/5.8
    • e8579fd6 - Merge branch 'feature/crm2' into release/5.8
    • 5eba6fb6 - 新品到着店铺类型
    • 21e40fad - 店铺跳转
    • 563ee9e3 - Merge branch 'feature/recommendShop' into 'release/5.8'
    • f56db435 - 跳转链接
    • b91ddcd5 - 报错日志
    • eafb2b3c - 完善依赖
    • e988dd03 - 代码检查
    • 1c01406a - Merge branch 'feature/similar' into 'release/5.8'
    • a5462802 - top-fixed-tag
    • 4982cdfd - Merge branch 'feature/guang2' into release/5.8
    • 3b177db9 - 订单列表加价购赠品价格
    • d1632660 - Merge branch 'feature/orderApportion' into 'release/5.8'
    • 1dd2ae03 - 加价购判断
    • e6210ae9 - Merge branch 'feature/orderApportion' into 'release/5.8'
    • 89966e4b - show
    • 5e775faa - Merge branch 'feature/guang2' into release/5.8
    • f7f70f6f - class
    • 498b7518 - Merge branch 'feature/guang2' into release/5.8
    • d4fef7f0 - Merge branch 'feature/errorLog' into 'release/5.8'
    • 4d9a768b - praise
    • 8e8e5e66 - Merge branch 'feature/guang2' into release/5.8
    • 2f73b0d4 - video-tag
    • caeb8b84 - video-tag
    • ebfac5d8 - 升级 jQuery
    • 15a20373 - URL重写
    • f1f376d2 - 5.8.0
    • 3c1b2925 - preload-none
    • c0232bb0 - handle-c
    • 3b5fa3c1 - 接口更改
    • a273ae5c - Merge branch 'feature/installment' into 'release/5.8'
    • c870f7e1 - id更改
    • 468eaf6f - Merge branch 'feature/installment' into 'release/5.8'
    • 49f6eccd - app_version
    • 24bca4c9 - Merge branch 'feature/guang2' into 'release/5.8'
    • 2fa85a75 - packageData-version
    • 9a110745 - appVersion
    • d9994124 - Merge branch 'feature/guang2' into 'release/5.8'
    • 8317da15 - 开发完成
    • 37b0bb5d - 店铺样式
    • 3136a0f0 - Merge branch 'feature/recommendShop' into 'release/5.8'
    • 395fd576 - sale样式老版本错位修改
    • 89385413 - Merge branch 'feature/saleDislocation' into 'release/5.8'
    • 9a35259d - 优化图片
    • 04bc1a08 - 接口地址
    • 630a69a7 - Merge branch 'feature/goodsList' into 'release/5.8'
    • c4c69eaf - video-protocol-handle
    • 8cabe6c2 - Merge branch 'feature/guang2' into 'release/5.8'
    • 8b6f8898 - image2
    • f9e1e760 - loading-handle
    • 0e940f76 - Merge branch 'feature/guang2' into 'release/5.8'
    • 9f5c4e0e - union_type参数
    • 80af115a - Merge branch 'feature/goodsList' into 'release/5.8'
    • 9cabab1a - ipv6
    • 3c33a567 - Merge branch 'hotfix/ipv6' into 'release/5.8'
    • d8a0e2d9 - 新品
    • e1a109c1 - Merge branch 'feature/listNew' into 'release/5.8'
    • 44854a5c - Merge branch 'release/5.8'
    • f30fd583 - 按钮样式
    • d5c32b26 - avatar-src
    • a23d5152 - Merge branch 'hotfix/similar' into 'master'
    • 004886c3 - Merge branch 'feature/guang2' into 'master'
    • 26479072 - Merge branch 'master' into feature/seoTDK
  • 毕凯
    @bikai 2017-06-21 06:12:29 UTC

    Status changed to closed

  • Please register or login to post a comment
644 of 1776
Prev Next
周少峰
Assignee
周少峰 @zhoushaofeng
Assign to
None
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: fe/yohobuywap-node!644