Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
O
Open Source Docs Website
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 1
    • Issues 1
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Open Source Docs Website
  • Merge Requests
  • !3

Open
Opened 1 day ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

WIP: Chore/docs updates

Edited 2 hours ago by Mark Harding

Check out, review, and merge locally

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

git fetch origin
git checkout -b chore/docs-updates origin/chore/docs-updates

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 chore/docs-updates

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.

Request to merge chore/docs-updates into master
Open in Web IDE
  • Email patches
  • Plain diff
No approval required
This is a Work in Progress

Deletes source branch

You can merge this merge request manually using the
  • Discussion 8
  • Commits 8
  • Changes 4
3/5 threads resolved
  • Loading...
  • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Interesting Iguana 1 day ago

    changed milestone to %sprint: Interesting Iguana

  • Brian Hatchet :speech_balloon: @brianhatchet changed title from Chore/docs updates to (WIP) Chore/docs updates 1 day ago

    changed title from Chore/docs updates to (WIP) Chore/docs updates

  • Mark Harding
    Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
    Resolved by Brian Hatchet 1 day ago
  • Mark Harding
    Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
    Resolved by Brian Hatchet 1 day ago
  • Mark Harding
    Mark Harding @markeharding started a thread on an old version of the diff 1 day ago
    Resolved by Brian Hatchet 1 day ago
  • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 day ago

    added 1 commit

    • cebfc1e2 - CR updates

    Compare with previous version

  • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 day ago

    added 1 commit

    • ca524797 - Kubernetes documentation

    Compare with previous version

  • Brian Hatchet :speech_balloon: @brianhatchet resolved all threads 1 day ago

    resolved all threads

  • Brian Hatchet
    Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
    docs/guides/deployment.md
    17 17 docker build -t minds/runners:latest -f containers/php-runners/Dockerfile .
    18 18 ```
    19 19
    20 ## Getting connected to the staging environment
    21
    22 ### Prerequisties
    23 * Your AWS access keys setup in your environment
    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet · 1 day ago
      Maintainer

      @markeharding I added this section about getting connected to staging

    • Please register or sign in to reply
  • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 16 hours ago

    added 1 commit

    • 2ca48106 - Simple helm configuration instructions. No more need to purge or delete

    Compare with previous version

  • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 16 hours ago

    added 1 commit

    • 9dd9bc6d - typo

    Compare with previous version

  • Marcelo Rivera @eiennohi approved this merge request 3 hours ago

    approved this merge request

  • Mark Harding @markeharding approved this merge request 2 hours ago

    approved this merge request

  • Mark Harding @markeharding marked as a Work In Progress 2 hours ago

    marked as a Work In Progress

  • Mark Harding @markeharding changed title from (WIP) Chore/docs updates to WIP: Chore/docs updates 2 hours ago

    changed title from (WIP) Chore/docs updates to WIP: Chore/docs updates

  • Ben Hayward
    Ben Hayward @benhayward.ben started a thread on an old version of the diff 1 hour ago
    Last updated by Brian Hatchet 1 hour ago
    docs/guides/deployment.md
    17 17 docker build -t minds/runners:latest -f containers/php-runners/Dockerfile .
    18 18 ```
    19 19
    20 ## Getting connected to the staging environment
    21
    22 ### Prerequisties
    23 * Your AWS access keys setup in your environment
    24 * AWS_ACCESS_KEY={Your access key provided by Mark}
    25 * AWS_SECRET_ACCESS_KEY={Your secret access key provided by Mark}
    26 * AWS_DEFAULT_REGION=US-EAST-1
    • Ben Hayward
      Ben Hayward @benhayward.ben · 1 hour ago
      Developer

      If using AWS configure this should be set lowercase

    • Brian Hatchet :speech_balloon: @brianhatchet changed this line in version 6 of the diff 1 hour ago

      changed this line in version 6 of the diff

    • Please register or sign in to reply
  • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 hour ago

    added 1 commit

    • 5ed23449 - lower case region

    Compare with previous version

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Assignee
Brian Hatchet's avatar Brian Hatchet @brianhatchet
Assign to
sprint: Interesting Iguana
Milestone
sprint: Interesting Iguana
Assign milestone
None
Time tracking
No estimate or time spent
0
Labels
None
Assign labels
  • View project labels
Lock merge request
Unlocked
4
4 participants
user avatar
Brian Hatchet
user avatar
Ben Hayward
user avatar
Mark Harding
user avatar
Marcelo Rivera
Reference: minds/oss-website!3