Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 827
    • Issues 827
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • 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
  • !559

Open
Opened 35 minutes ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

Bug/admin activity service 1921

Fixes #1921

Added the activity service to the admin panels

Check out, review, and merge locally

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

git fetch origin
git checkout -b "bug/admin-activity-service-1921" "origin/bug/admin-activity-service-1921"

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 "bug/admin-activity-service-1921"

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 bug/admin-activity-service-1921 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #82768660 running for b74b25f7 on bug/admin-activity-service-1921
              Merge request approved. Approved by
              Mark Harding
              Mark Harding
              Ben Hayward
              Ben Hayward
              Juan Manuel Solaro
              Juan Manuel Solaro
              Marcelo Rivera
              Marcelo Rivera
              Guy Thouret
              Guy Thouret
              Emiliano Balbuena
              Emiliano Balbuena

              Set by Mark Harding to be merged automatically when the pipeline succeeds

              The changes will be merged into master

              The source branch will be deleted

              Deletes source branch

              • Discussion 0
              • Commits 34
              • Pipelines 2
              • Changes 5
              • Loading...
              • Brian Hatchet :speech_balloon: @brianhatchet added Squad::Green scoped label 35 minutes ago

                added Squad::Green scoped label

              • Brian Hatchet :speech_balloon: @brianhatchet added MR::Awaiting Review scoped label 32 minutes ago

                added MR::Awaiting Review scoped label

              • Brian Hatchet :speech_balloon: @brianhatchet added Sprint::09/11 - Nuanced Numbat scoped label 31 minutes ago

                added Sprint::09/11 - Nuanced Numbat scoped label

              • Brian Hatchet :speech_balloon: @brianhatchet added 15 commits 22 minutes ago

                added 15 commits

                • b2306f0e...b2be500f - 14 commits from branch master
                • b74b25f7 - Updating with master

                Compare with previous version

              • Mark Harding @markeharding approved this merge request 8 minutes ago

                approved this merge request

              • Mark Harding @markeharding enabled an automatic merge when the pipeline for b74b25f7 succeeds 8 minutes ago

                enabled an automatic merge when the pipeline for b74b25f7 succeeds

              • 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
              Brian Hatchet's avatar
              Brian Hatchet @brianhatchet
              Assign to
              None
              Milestone
              None
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              3
              Labels
              MR::Awaiting Review Sprint::09/11 - Nuanced Numbat Squad::Green
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              9
              9 participants
              user avatar
              Ben Hayward
              user avatar
              Juan Manuel Solaro
              user avatar
              Marcelo Rivera
              user avatar
              Guy Thouret
              user avatar
              Emiliano Balbuena
              user avatar
              Martin Santangelo
              user avatar
              Olivia Madrid
              Reference: minds/front!559