Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

tingweiwang / configmap-kpl

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 1
  • Pipelines
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Open
Merge Request !11 opened Apr 25, 2021 by ningfd@ningfd

Update cfg-kpl-nginx.yaml.j2

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b change_nginx_config origin/change_nginx_config

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 change_nginx_config

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 5
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • ningfd @ningfd

    added 1 commit

    • 9b73bc43 - Update cfg-kpl-nginx.yaml.j2

    Compare with previous version

    Apr 25, 2021

    added 1 commit

    • 9b73bc43 - Update cfg-kpl-nginx.yaml.j2

    Compare with previous version

    added 1 commit * 9b73bc43 - Update cfg-kpl-nginx.yaml.j2 [Compare with previous version](https://gitlab.seetatech.com/tingweiwang/configmap-kpl/merge_requests/11/diffs?diff_id=7699&start_sha=b954597100b6ed5afa9b527afe04eb4e6f6023d1)
    Toggle commit list
  • ningfd @ningfd

    added 2 commits

    • bcac2dd5 - 1 commit from branch master
    • 56f7b1f0 - Merge branch 'master' into 'change_nginx_config'

    Compare with previous version

    Jun 01, 2021

    added 2 commits

    • bcac2dd5 - 1 commit from branch master
    • 56f7b1f0 - Merge branch 'master' into 'change_nginx_config'

    Compare with previous version

    added 2 commits * bcac2dd5 - 1 commit from branch `master` * 56f7b1f0 - Merge branch 'master' into 'change_nginx_config' [Compare with previous version](https://gitlab.seetatech.com/tingweiwang/configmap-kpl/merge_requests/11/diffs?diff_id=7841&start_sha=9b73bc43dd11132d62d0c59a2b852ee67cc853f6)
    Toggle commit list
  • ningfd @ningfd

    added 1 commit

    • f1396f28 - Update cfg-kpl-backend.yaml.j2 教育平台tab显示开关

    Compare with previous version

    Jun 01, 2021

    added 1 commit

    • f1396f28 - Update cfg-kpl-backend.yaml.j2 教育平台tab显示开关

    Compare with previous version

    added 1 commit * f1396f28 - Update cfg-kpl-backend.yaml.j2 教育平台tab显示开关 [Compare with previous version](https://gitlab.seetatech.com/tingweiwang/configmap-kpl/merge_requests/11/diffs?diff_id=7842&start_sha=56f7b1f0753d81f6dfc56566568bec400bb65fbe)
    Toggle commit list
  • ningfd @ningfd

    added 1 commit

    • 61cb17d1 - Update cfg-kpl-backend.yaml.j2

    Compare with previous version

    Jun 01, 2021

    added 1 commit

    • 61cb17d1 - Update cfg-kpl-backend.yaml.j2

    Compare with previous version

    added 1 commit * 61cb17d1 - Update cfg-kpl-backend.yaml.j2 [Compare with previous version](https://gitlab.seetatech.com/tingweiwang/configmap-kpl/merge_requests/11/diffs?diff_id=7843&start_sha=f1396f28b982b131da0fe809b7a754f90f14ce9d)
    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: tingweiwang/configmap-kpl!11