Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
app_push
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • ikcrm_server
  • app_push
  • Merge Requests
  • !3

Merged
Opened Mar 16, 2020 by 于子洵@yuzixun 
  • Report abuse
Report abuse

Feature/notification stat

×

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/notification_stat origin/feature/notification_stat

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff feature/notification_stat

Step 4. Push the result of the merge to GitLab

git push origin master

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

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

  • Discussion 0
  • Commits 1
  • Changes 11
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 于子洵 @yuzixun

    added 3 commits

    • 90f820e5 - add database yml to git ignore
    • 08ffec53 - add databse yml link file
    • 0ed159d1 - 修复device_platform

    Compare with previous version

    Mar 17, 2020

    added 3 commits

    • 90f820e5 - add database yml to git ignore
    • 08ffec53 - add databse yml link file
    • 0ed159d1 - 修复device_platform

    Compare with previous version

    added 3 commits * 90f820e5 - add database yml to git ignore * 08ffec53 - add databse yml link file * 0ed159d1 - 修复device_platform [Compare with previous version](http://gitlab.ikcrm.com/ikcrm_server/app_push/merge_requests/3/diffs?diff_id=57212&start_sha=cec30e8a64c29a8489abb0e9730545b98ccd33ce)
    Toggle commit list
  • 于子洵 @yuzixun

    added 1 commit

    • cdfc538f - 添加到达率统计

    Compare with previous version

    Mar 17, 2020

    added 1 commit

    • cdfc538f - 添加到达率统计

    Compare with previous version

    added 1 commit * cdfc538f - 添加到达率统计 [Compare with previous version](http://gitlab.ikcrm.com/ikcrm_server/app_push/merge_requests/3/diffs?diff_id=57213&start_sha=0ed159d194588309247736a8f26bd24ccc8fba72)
    Toggle commit list
  • 于子洵 @yuzixun

    merged

    Mar 17, 2020

    merged

    merged
    Toggle commit list
  • 于子洵 @yuzixun

    mentioned in commit 5b2d80ce

    Mar 17, 2020

    mentioned in commit 5b2d80ce

    mentioned in commit 5b2d80cee06d7dd69b4fc1ff68c016ce91ef47b8
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: ikcrm_server/app_push!3
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.