Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • 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
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 153
    • Issues 153
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 41
    • Merge Requests 41
  • 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 Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !197

Open
Opened 6 days ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe] (feat): use imagick for blogs, groups, channel and admin pages

closes mobile-native#748

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/engine.git sprint/GiddyGiraffe.feat.use-imagick
git checkout -b eiennohi/engine-sprint/GiddyGiraffe.feat.use-imagick 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/engine-sprint/GiddyGiraffe.feat.use-imagick

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.feat.use-imagick into master
The source branch is 23 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #65548414 (#953) passed for 30636110 on eiennohi:sprint/GiddyGiraffe.feat.use-imagick
      Requires 2 more approvals from Devs.
      Brian Hatchet
      Brian Hatchet
      Emiliano Balbuena
      Emiliano Balbuena
      Ben Hayward
      Ben Hayward
      Martin Santangelo
      Martin Santangelo
      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 mobile-native#748

      Deletes source branch

      • Discussion 1
      • Commits 6
      • Pipelines 2
      • Changes 8
      • Loading...
      • Marcelo Rivera @eiennohi added 1 commit 6 days ago

        added 1 commit

        • 30636110 - (feat): spec tests

        Compare with previous version

      • Mark Harding
        Mark Harding @markeharding · 6 hours ago
        Owner

        @eiennohi on rubbersoul for testing. Need to pay close attention to avatars being squares and correct sizes here

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