Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 803
    • Issues 803
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 61
    • Merge Requests 61
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !390

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

[Sprint/HipsterHedgehog] (feat): enable autocomplete for @ tagging

closes #339

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/user-autocomplete origin/feat/user-autocomplete

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/user-autocomplete

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/user-autocomplete into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #70196854 running for 81414daa on feat/user-autocomplete
          Requires 2 more approvals from Devs and Deployers.
          Ben Hayward
          Ben Hayward
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #339

          Deletes source branch

          • Discussion 2
          • Commits 7
          • Pipelines 3
          • Changes 16
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request !380 (closed) 1 week ago

            mentioned in merge request !380 (closed)

          • Marcelo Rivera @eiennohi added 9 commits 1 week ago

            added 9 commits

            • a967d932...9adda44a - 8 commits from branch master
            • 212bb61b - Merge remote-tracking branch 'upstream/master' into feat/user-autocomplete

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding · 1 week ago
            Owner
            • Request fired unnecessarily. Screen_Shot_2019-07-02_at_12.11.56_PM

            • Avatars with username

          • Mark Harding @markeharding added MR::Requires Changes label 1 week ago

            added MR::Requires Changes label

          • Marcelo Rivera @eiennohi added 72 commits 4 minutes ago

            added 72 commits

            • 212bb61b...102ce847 - 67 commits from branch master
            • 3bcbbb69 - Merge remote-tracking branch 'upstream/master' into feat/user-autocomplete
            • 2a873b86 - (feat): reformat text input autocomplete
            • cf89c65d - (fix): use site paddings for suggestion elements
            • 9d8e4ea2 - (feat): enable custom item templates for suggestions
            • 81414daa - (feat): use new custom template for user and hashtags suggestions

            Compare with previous version

            Toggle commit list
          • Marcelo Rivera
            Marcelo Rivera @eiennohi · 3 minutes ago
            Developer

            @markeharding done. I added the ability to provide a custom template (check out the diffs from the latest commits)

          • 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
          1
          Labels
          MR::Requires Changes
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          6
          6 participants
          user avatar
          Ben Hayward
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          Reference: minds/front!390