Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
M
media-resource
  • 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
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 杨昕
  • media-resource
  • Merge Requests
  • !40

Merged
Opened Jul 12, 2022 by 杨昕@yf60144 
  • Report abuse
Report abuse

Test

添加媒资视频封面图

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b test origin/test

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 test

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 51
  • Pipelines 51
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 杨昕 @yf60144

    added 38 commits

    • 65e50a5f...1314b32c - 37 commits from branch master
    • b811f2fc - Merge branch 'master' into 'test'

    Compare with previous version

    Jul 12, 2022

    added 38 commits

    • 65e50a5f...1314b32c - 37 commits from branch master
    • b811f2fc - Merge branch 'master' into 'test'

    Compare with previous version

    added 38 commits <ul><li>65e50a5f...1314b32c - 37 commits from branch <code>master</code></li><li>b811f2fc - Merge branch &#39;master&#39; into &#39;test&#39;</li></ul> [Compare with previous version](https://gitlab.eoffcn.com/yf60144/media-resource/merge_requests/40/diffs?diff_id=47509&start_sha=65e50a5f3d89fd64732dbb5e8c5acfd67b919f14)
    Toggle commit list
  • 杨昕 @yf60144

    merged

    Jul 12, 2022

    merged

    merged
    Toggle commit list
  • 杨昕 @yf60144

    mentioned in commit ecb58233

    Jul 12, 2022

    mentioned in commit ecb58233

    mentioned in commit ecb582338b800f262c5c93ec3810a1136554af37
    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
Reference: yf60144/media-resource!40
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.