Skip to content

Next

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

Open
Opened 2 days ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/InterestingIguana] (feat): disable VPN restriction for staging

closes #579 (closed) depends on helm-charts!1 (merged)

@brianhatchet had already implemented it so just added the flag to settings.example.php and Installer.php

Edited 2 days ago by Marcelo Rivera

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/disable-vpn-for-staging origin/feat/disable-vpn-for-staging

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 feat/disable-vpn-for-staging

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 feat/disable-vpn-for-staging into master
The source branch is 5 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #69893309 passed with warnings for e3053eb9 on feat/disable-vpn-for-staging
          Requires approval from Deployers. Approved by
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Ben Hayward
          Ben Hayward
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Closes #579 (closed)

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 1
          • Commits 1
          • Pipelines 1
          • Changes 2
          0/1 thread resolved
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request helm-charts!1 (merged) 2 days ago

            mentioned in merge request helm-charts!1 (merged)

          • Marcelo Rivera @eiennohi changed the description 2 days ago

            changed the description

          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 11 minutes ago

            approved this merge request

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 6 minutes ago
            settings.example.php
            1 1 <?php
            2 2 $CONFIG = Minds\Core\Di\Di::_()->get('Config');
            3 $CONFIG->development_mode = '{{development-mode}}';
            • Mark Harding
              Mark Harding @markeharding · 6 minutes ago
              Owner

              line 467 already sets this fyi

            • 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
          0 Assignees
          None
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          0
          Labels
          None
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Ben Hayward
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          Reference: minds/engine!257