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 893
    • Issues 893
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • 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
  • !181

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

WIP: Prioritize live gatherings

Prioritize's live gatherings putting them at the top -

o This needs testing on a system with Jitsi set up. Worked with my dependency injection but needs a test on a system set up with Jitsi o The rest of the order is changed slightly - unsure what order they should be in to start with. Alphabetical?

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 prioritise-live-gatherings
git checkout -b benhayward.ben/front-prioritise-live-gatherings 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-prioritise-live-gatherings

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:prioritise-live-gatherings into master
  • Email patches
  • Plain diff
Pipeline #51348146 passed for bc2c8c51 on benhayward.ben:prioritise-live-gatherings
    Requires approval.

    Closed by Ben Hayward 1 hour ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Deletes source branch

    • Discussion 0
    • Commits 3
    • Pipelines 3
    • Changes 1
    • Loading...
    • Mark Harding @markeharding added Squad::Green scoped label 1 month ago

      added Squad::Green scoped label

    • Ben Hayward @benhayward.ben changed milestone to %sprint: Kilted Koala 1 month ago

      changed milestone to %sprint: Kilted Koala

    • Ben Hayward @benhayward.ben assigned to @benhayward.ben 1 month ago

      assigned to @benhayward.ben

    • Ben Hayward @benhayward.ben closed 1 hour 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
    Assignee
    Ben Hayward's avatar Ben Hayward @benhayward.ben
    Assign to
    sprint: Kilted Koala
    Milestone
    sprint: Kilted Koala
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    1
    Labels
    Squad::Green
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    1
    1 participant
    user avatar
    Ben Hayward
    Reference: minds/front!181