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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 146
    • Issues 146
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 36
    • Merge Requests 36
  • 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
  • !195

Open
Opened 1 day ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe] (fix): strip hash character from search

closes #503

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/engine.git sprint/GiddyGiraffe.feat.strip-hash-character-from-search
git checkout -b eiennohi/engine-sprint/GiddyGiraffe.feat.strip-hash-character-from-search FETCH_HEAD

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 eiennohi/engine-sprint/GiddyGiraffe.feat.strip-hash-character-from-search

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 eiennohi:sprint/GiddyGiraffe.feat.strip-hash-character-from-search into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #65383475 (#950) passed for 4d42522f on eiennohi:sprint/GiddyGiraffe.feat.strip-hash-character-from-search
      Requires approval from Devs. Approved by
      Mark Harding
      Mark Harding
      Ben Hayward
      Ben Hayward
      Emiliano Balbuena
      Emiliano Balbuena
      Rami Albatal
      Rami Albatal
      Martin Santangelo
      Martin Santangelo
      Brian Hatchet
      Brian Hatchet
      Ready to be merged automatically. Ask someone with write access to this repository to merge this request

      Allows commits from members who can merge to the target branch

      Closes #503

      Deletes source branch

      • Discussion 1
      • Commits 1
      • Pipelines 1
      • Changes 2
      0/1 discussion resolved
      • Loading...
      • Mark Harding @markeharding approved this merge request 20 hours ago

        approved this merge request

      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 7 hours ago
        Controllers/api/v2/feeds.php
        123 123
        124 124 $query = null;
        125 125 if (isset($_GET['query'])) {
        126 $query = strtolower($_GET['query']);
        126 $query = str_replace('#', '', strtolower($_GET['query']));
        • Mark Harding
          Mark Harding @markeharding · 7 hours ago
          Owner

          can we move both of these logics (remove hashtag + lower case) to Core along with 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
      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
      Ben Hayward
      user avatar
      Emiliano Balbuena
      user avatar
      Rami Albatal
      user avatar
      Martin Santangelo
      user avatar
      Brian Hatchet
      user avatar
      Mark Harding
      user avatar
      Marcelo Rivera
      Reference: minds/engine!195