Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
G
GitLab
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 392
    • Issues 392
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 31
    • Merge Requests 31
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • Container Registry
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • GitLab.org
  • charts
  • GitLab
  • Merge Requests
  • !951

Open
Opened Sep 12, 2019 by Ben Bodenmiller@bbodenmiller0 of 3 tasks completed0/3 tasks
  • Report abuse
Report abuse

WIP: Update external-omnibus-gitaly.md to match upstream changes

  • Overview 5
  • Commits 3
  • Pipelines 3
  • Changes 1

Changes to lineup with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32957 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32956

Todo:

  • finish https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32956 and incorporate changes
  • incorporate missing path changes talked about in https://gitlab.com/gitlab-org/gitlab-ce/issues/65422
  • incorporate https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32961
Edited Sep 12, 2019 by Ben Bodenmiller

Check out, review, and merge locally

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

git fetch origin
git checkout -b "docs-patch-1" "origin/docs-patch-1"

Step 2. Review the changes locally

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

git fetch origin
git checkout "origin/master"
git merge --no-ff "docs-patch-1"

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.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
4
Labels
Community contribution devops::enablement documentation group::distribution
Assign labels
  • View project labels
Reference: gitlab-org/charts/gitlab!951