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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 836
    • Issues 836
    • 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
  • !358

Open
Opened 16 hours ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

(fix): don't send offset and finish if they weren't explicitly provided

closes #380

Edited 20 minutes ago by Marcelo Rivera

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/front.git sprint/GiddyGiraffe.fix.duplicated-messages-issue-in-messenger
git checkout -b eiennohi/front-sprint/GiddyGiraffe.fix.duplicated-messages-issue-in-messenger 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/front-sprint/GiddyGiraffe.fix.duplicated-messages-issue-in-messenger

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.fix.duplicated-messages-issue-in-messenger into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #66745274 (#1940) passed for 302dc6c0 on eiennohi:sprint/GiddyGiraffe.fix.duplicated-messages-issue-in-messenger
    Requires 2 more approvals from Devs.
    Martin Santangelo
    Martin Santangelo
    Ben Hayward
    Ben Hayward
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding
    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 #380

    Deletes source branch

    • Discussion 2
    • Commits 2
    • Pipelines 2
    • Changes 1
    0/1 discussion resolved
    • Loading...
    • Marcelo Rivera @eiennohi mentioned in merge request engine!211 (closed) 16 hours ago

      mentioned in merge request engine!211 (closed)

    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 5 hours ago
      Last updated by Marcelo Rivera 20 minutes ago
      src/app/modules/messenger/conversation/conversation.component.ts
      169 167 fromSelf = true;
      170 168 }
      171 169
      172 170 this.load({ finish: message.guid });
      • Mark Harding
        Mark Harding @markeharding · 5 hours ago
        Owner

        @eiennohi why not just pass through limit: 1 here rather than changing the backend?

      • Marcelo Rivera @eiennohi changed this line in version 2 of the diff 20 minutes ago

        changed this line in version 2 of the diff

      • Marcelo Rivera
        Marcelo Rivera @eiennohi · 20 minutes ago
        Developer

        done. closing the other MR

      Please register or sign in to reply
    • Marcelo Rivera @eiennohi added 1 commit 20 minutes ago

      added 1 commit

      • 302dc6c0 - (fix): send limit: 1 when listening from socket

      Compare with previous version

    • Marcelo Rivera @eiennohi changed the description 20 minutes ago

      changed the description

    • 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
    6
    6 participants
    user avatar
    Martin Santangelo
    user avatar
    Ben Hayward
    user avatar
    Emiliano Balbuena
    user avatar
    Brian Hatchet
    user avatar
    Mark Harding
    user avatar
    Marcelo Rivera
    Reference: minds/front!358