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 843
    • Issues 843
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • 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
  • !464

Open
Opened 1 day ago by Guy Thouret@gthouret
  • Report abuse
Report abuse

WIP: Rewards Notifications

Related to #1582

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/588-state-on-user origin/feat/588-state-on-user

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/588-state-on-user

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/588-state-on-user into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #73234993 failed for 2b30d7ee on feat/588-state-on-user
          Requires 2 more approvals from Devs and Deployers.
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Marcelo Rivera
          Marcelo Rivera
          This is a Work in Progress

          Mentions #1582

          You can merge this merge request manually using the
          • Discussion 1
          • Commits 2
          • Pipelines 2
          • Changes 2
          • Loading...
          • Guy Thouret @gthouret changed milestone to %sprint: Jolly Jellyfish 1 day ago

            changed milestone to %sprint: Jolly Jellyfish

          • Guy Thouret @gthouret added MR::Awaiting Review Priority::2 - Normal Product::Wallet Squad::Blue Type::Feature scoped labels 1 day ago

            added MR::Awaiting Review Priority::2 - Normal Product::Wallet Squad::Blue Type::Feature scoped labels

          • Guy Thouret
            Guy Thouret @gthouret · 1 day ago
            Developer

            Could do with a second opinion on wording of the notifications.

          • 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
          sprint: Jolly Jellyfish
          Milestone
          sprint: Jolly Jellyfish
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          5
          Labels
          MR::Awaiting Review Priority::2 - Normal Product::Wallet Squad::Blue Type::Feature
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Martin Santangelo
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          user avatar
          Ben Hayward
          user avatar
          Guy Thouret
          Reference: minds/front!464