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 812
    • Issues 812
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 67
    • Merge Requests 67
  • 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
  • !272

Closed
Opened 2 months ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/CleverChipmunk] (feat): prevent blogs editing from changing page without warning

closes #1150 (closed)

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/front.git sprint/CleverChipmunk.feat.prevent-blogs-editing-from-changing-page-without-warning
git checkout -b eiennohi/front-sprint/CleverChipmunk.feat.prevent-blogs-editing-from-changing-page-without-warning 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/front-sprint/CleverChipmunk.feat.prevent-blogs-editing-from-changing-page-without-warning

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/CleverChipmunk.feat.prevent-blogs-editing-from-changing-page-without-warning into master
  • Email patches
  • Plain diff
Pipeline #58367587 passed for e1f74576 on eiennohi:sprint/CleverChipmunk.feat.prevent-blogs-editing-from-changing-page-without-warning
    Requires approval.

    Closed by Mark Harding 4 minutes ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close #1150 (closed)

    Deletes source branch

    • Discussion 2
    • Commits 5
    • Pipelines 2
    • Changes 9
    0/1 discussion resolved
    • Loading...
    • Marcelo Rivera @eiennohi added 1 commit 2 months ago

      added 1 commit

      • e1f74576 - (fix): spec tests

      Compare with previous version

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 2 months ago
      src/app/modules/suggestions/channel/sidebar.component.ts
      12 12 suggestions: Array<any> = [];
      13 13 lastOffset = 0;
      14 14 inProgress: boolean = false;
      15 error: string;
      • Mark Harding
        Mark Harding @markeharding · 2 months ago
        Owner

        any reason this is changed?

      Please register or sign in to reply
    • Mark Harding
      Mark Harding @markeharding · 2 months ago
      Owner

      Can we simplify this to resemble the poster more? I understand we're trying to stripe out the default markdown but I don't think this is necessary. The simplicity and limited amount of changes is the key here so we can be confident we've not caused more bugs. We also have multiple Router Guards be used which seems strange.

    • Mark Harding @markeharding added MR::Awaiting Review label 1 day ago

      added MR::Awaiting Review label

    • Mark Harding @markeharding closed 4 minutes 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
    None
    Assign to
    None
    Milestone
    None
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    2
    2 participants
    user avatar
    Mark Harding
    user avatar
    Marcelo Rivera
    Reference: minds/front!272