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 2
    • Issues 2
    • 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 45 minutes ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

(WIP) Chore/docs updates

Edited 44 minutes ago by Brian Hatchet

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
Ready to be merged automatically. Ask someone with write access to this repository to merge this request

Deletes source branch

  • Discussion 3
  • Commits 3
  • Changes 5
0/3 threads resolved
  • Loading...
  • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Interesting Iguana 45 minutes ago

    changed milestone to %sprint: Interesting Iguana

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

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

  • Mark Harding
    Mark Harding @markeharding started a thread on the diff 41 minutes ago
    docs/guides/deployment.md
    49 49 ./helm-charts/minds
    50 50 ```
    51 51
    52 ### Managing settings on the Review Apps
    53
    54 When a pod gets deployed, it runs the installer which creates the default settings.php from the settings.example.php. However, the helm charts override those values with the template that is in our [Helm charts](https://gitlab.com/minds/helm-charts)
    • Mark Harding
      Mark Harding @markeharding · 41 minutes ago
      Owner

      Installer no longer writes the settings.php (I don' think). Its handled by the K8S templates/configMap.yaml

    • Please register or sign in to reply
  • Mark Harding
    Mark Harding @markeharding started a thread on the diff 40 minutes ago
    docs/guides/deployment.md
    79 You can test your *local changes* and manipulate the staging environments by using the helm-charts repo. Create your branch, make your changes and then, inside your helm-charts repository branch, run:
    80
    81 ```
    82 helm upgrade --reuse-values --wait
    83 {your.staging.site.subdomain} ./minds
    84 ```
    85
    86 This will apply your template to the staging pod's configuration using your local changes.
    87
    88 Then you must restart the pod by finding its name and deleting it.
    89
    90 ```
    91 kubectl get pods | grep {your.staging.site.subdomain}
    92 kubectl delete pod/{your.staging.site.subdomain}-minds-runners-{generated.suffix.returned.by.grep}
    93 kubectl detete pod/{your.staging.site.subdomain}-minds-php-fpm-{generated.suffix.returned.by.grep}
    94 ```
    • Mark Harding
      Mark Harding @markeharding · 40 minutes ago
      Owner

      helm charts can be deleted by

      helm del --purge my-release-name
    • Please register or sign in to reply
  • Mark Harding
    Mark Harding @markeharding started a thread on the diff 39 minutes ago
    docs/guides/unit-testing.md
    1 ---
    2 id: unit-testing
    • Mark Harding
      Mark Harding @markeharding · 39 minutes ago
      Owner

      potential to merge with https://gitlab.com/minds/oss-website/blob/master/docs/guides/backend.md#spec-tests?

    • Please register or sign in to reply
  • 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
2
2 participants
user avatar
Brian Hatchet
user avatar
Mark Harding
Reference: minds/oss-website!3