Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
mattermost-redux
mattermost-redux
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 2
    • Merge Requests 2
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Commits
  • sysadmin
  • mattermost
  • mattermost-reduxmattermost-redux
  • Merge Requests
  • !1

Open
Opened Jun 20, 2018 by Emil Velikov@evelikov1
  • Report abuse
Report abuse

Allow extra edit/delete features in !EE version

Title says it all. The !licensed edit tests were nuked all together.

Note: needs analogous MR across all three repos - redux, webapp and server.

Check out, review, and merge locally

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

git fetch "https://gitlab.collabora.com/evelikov/mattermost-redux.git" "tweak-edit"
git checkout -b "evelikov/mattermost-redux-tweak-edit" 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/collabora-5.0"
git merge --no-ff "evelikov/mattermost-redux-tweak-edit"

Step 4. Push the result of the merge to GitLab

git push origin "collabora-5.0"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 1
  • Changes 2
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: sysadmin/mattermost/mattermost-redux!1