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 799
    • Issues 799
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 60
    • Merge Requests 60
  • 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
  • !208

Closed
Opened 3 months ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/Wire](bug): Stop users from editing in more than 5 hashtags

Closing #867

Edited 3 months ago by Ben Hayward

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git edit-hashtag-fix
git checkout -b benhayward.ben/front-edit-hashtag-fix 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 benhayward.ben/front-edit-hashtag-fix

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 benhayward.ben:edit-hashtag-fix into master
  • Email patches
  • Plain diff
Pipeline #53577044 passed for 2ea1b2a5 on benhayward.ben:edit-hashtag-fix
    Requires approval.

    Closed by Ben Hayward 27 minutes ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close #867

    Deletes source branch

    • Discussion 6
    • Commits 11
    • Pipelines 12
    • Changes 8
    2/2 threads resolved
    • Loading...
    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • d203fa69 - Update activity.component.spec.ts

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • 2f54b8b7 - Update activity.ts

      Compare with previous version

    • Mark Harding
      Mark Harding @markeharding started a thread on an old version of the diff 3 months ago
      Resolved by Ben Hayward 3 months ago
    • Mark Harding
      Mark Harding @markeharding started a thread on an old version of the diff 3 months ago
      Resolved by Ben Hayward 1 month ago
    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • 8438ac20 - Update activity.ts

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • 5bcb9519 - Linked in to hashtag service

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • a0a7e88d - Moved tests from activity to service

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • 1aabe63a - Update activity.ts

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • 9d87245b - Fixed 4 failing tests

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • e33b66a3 - fixed 4 failing tests

      Compare with previous version

    • Ben Hayward @benhayward.ben marked as a Work In Progress 3 months ago

      marked as a Work In Progress

    • Ben Hayward @benhayward.ben added 1 commit 3 months ago

      added 1 commit

      • 893557ff - Moving the error box for edit

      Compare with previous version

    • Ben Hayward @benhayward.ben mentioned in issue mobile-native#690 (closed) 3 months ago

      mentioned in issue mobile-native#690 (closed)

    • Ben Hayward @benhayward.ben unmarked as a Work In Progress 3 months ago

      unmarked as a Work In Progress

    • Ben Hayward @benhayward.ben added 2 commits 3 months ago

      added 2 commits

      • 19468267 - Connected into service & triggered on keydown
      • 2ea1b2a5 - Forgot to remove console.log.

      Compare with previous version

    • Ben Hayward @benhayward.ben mentioned in issue #904 3 months ago

      mentioned in issue #904

    • Ben Hayward @benhayward.ben resolved all discussions 1 month ago

      resolved all discussions

    • Mark Harding @markeharding added MR::Awaiting Review label 1 week ago

      added MR::Awaiting Review label

    • Ben Hayward @benhayward.ben closed 27 minutes ago

      closed

    • 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::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    2
    2 participants
    user avatar
    Ben Hayward
    user avatar
    Mark Harding
    Reference: minds/front!208