Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove "All" permission for Workspace (backport #19496) #19512

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 7, 2023

This is an automatic backport of pull request #19496 done by Mergify.
Cherry-pick of 033c6b3 has failed:

On branch mergify/bp/version-13-hotfix/pr-19496
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 033c6b357e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/doctype/workspace/workspace.json
	both modified:   frappe/desk/doctype/workspace/workspace.py
	both modified:   frappe/public/js/frappe/views/workspace/workspace.js

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 033c6b3)

# Conflicts:
#	frappe/desk/doctype/workspace/workspace.json
#	frappe/desk/doctype/workspace/workspace.py
#	frappe/public/js/frappe/views/workspace/workspace.js
@mergify mergify bot requested a review from a team as a code owner January 7, 2023 13:27
@mergify mergify bot removed the request for review from a team January 7, 2023 13:27
@mergify mergify bot added the conflicts label Jan 7, 2023
@mergify mergify bot requested a review from shariquerik January 7, 2023 13:27
@shariquerik
Copy link
Member

Workspace 2.0 was added in v14

@shariquerik shariquerik closed this Jan 7, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-19496 branch January 7, 2023 13:56
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants