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 817
    • Issues 817
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 70
    • Merge Requests 70
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !398

Open
Opened 22 hours ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Spring/HipsterHedgehog](feat) Discard changes when creating and editing blogs #349

Closes #349

Hosted at https://feat-confirm-leave-dialog-blogs-349.minds.io/blog/edit/new image

Edited 2 hours ago by Ben Hayward

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/confirm-leave-dialog-blogs-349 origin/feat/confirm-leave-dialog-blogs-349

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/confirm-leave-dialog-blogs-349

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/confirm-leave-dialog-blogs-349 into master
The source branch is 5 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #69080246 running for 3c552de6 on feat/confirm-leave-dialog-blogs-349
          Requires 2 more approvals from Devs and Deployers.
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #349

          Deletes source branch

          • Discussion 2
          • Commits 3
          • Pipelines 5
          • Changes 3
          1/1 discussion resolved
          • Loading...
          • Mark Harding
            Mark Harding @markeharding · 8 hours ago
            Owner

            Cans you make sure you're in sync with master? You look to be missing some pipelines

          • Ben Hayward @benhayward.ben added 12 commits 7 hours ago

            added 12 commits

            • 9878ee7b...432ac391 - 8 commits from branch master
            • 5ce9b042 - Added in buttons for play store and ios
            • 28c37730 - Addressed feedback
            • 837d2b82 - Merge branch 'ios-android-added-play-store2' of...
            • bb1381f7 - Merge branch 'master' of gitlab.com:minds/front into feat/confirm-leave-dialog-blogs-349

            Compare with previous version

            Toggle commit list
          • Ben Hayward @benhayward.ben added 1 commit 6 hours ago

            added 1 commit

            • a2859ce2 - added confirmation of leave on blog editing

            Compare with previous version

          • Ben Hayward @benhayward.ben added 9 commits 6 hours ago

            added 9 commits

            • a2859ce2...432ac391 - 8 commits from branch master
            • b432a64f - Merge branch 'master' of gitlab.com:minds/front into feat/confirm-leave-dialog-blogs-349

            Compare with previous version

          • Ben Hayward @benhayward.ben changed the description 2 hours ago

            changed the description

          • Emiliano Balbuena @edgebal approved this merge request 34 minutes ago

            approved this merge request

          • Emiliano Balbuena @edgebal unapproved this merge request 34 minutes ago

            unapproved this merge request

          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a discussion on the diff 30 minutes ago
            Resolved by Ben Hayward 10 minutes ago
          • Ben Hayward @benhayward.ben added 1 commit 10 minutes ago

            added 1 commit

            • 3c552de6 - Don't show discard changes if not logged in

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all discussions 10 minutes ago

            resolved all discussions

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