Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 238
    • Issues 238
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • 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 Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !375

Open
Opened 1 minute ago by Emiliano Balbuena@edgebal2 of 4 tasks completed2/4 tasks
  • Report abuse
Report abuse

WIP: Pro logo and background upload

  • Receive uploaded assets and validate
  • Save asset to filestore
  • Implement /fs/pro endpoint. It should allow cache busting.
  • Export URLs for assets when exporting Settings

Check out, review, and merge locally

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

git fetch origin
git checkout -b "goal/pro-logo-upload" "origin/goal/pro-logo-upload"

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 "goal/pro-logo-upload"

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 goal/pro-logo-upload into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #89339183 running for 9f420934 on goal/pro-logo-upload
          Requires 3 more approvals from Devs, Deployers, and QA.
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Guy Thouret
          Guy Thouret
          Marcelo Rivera
          Marcelo Rivera
          This is a Work in Progress

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 0
          • Commits 1
          • Pipelines 1
          • Changes 4
          • Loading...
          • Emiliano Balbuena @edgebal changed milestone to %Pro Beta #release 1 minute ago

            changed milestone to %Pro Beta #release

          • Emiliano Balbuena @edgebal added Squad::Yellow scoped label 1 minute ago

            added Squad::Yellow scoped label

          • 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
          Emiliano Balbuena's avatar
          Emiliano Balbuena @edgebal
          Assign to
          Pro Beta #release
          Milestone
          Pro Beta #release
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Guy Thouret
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Ben Hayward
          Reference: minds/engine!375