Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
erp5
Repository
f0808ac686f3258c33bb67ee854f58c402548b52
Switch branch/tag
erp5
..
transitions
resolve_conflict_with_merge.xml
Find file
Blame
History
Permalink
workflow: add workflow transition guard for non-user actions as well.
· f0808ac6
Kazuhiko Shiozaki
authored
Nov 18, 2015
they are mostly 'Modify portal content' permission.
f0808ac6
resolve_conflict_with_merge.xml
2.36 KB
Edit
Web IDE
Replace resolve_conflict_with_merge.xml
×
Attach a file by drag & drop or
click to upload
Commit message
Replace resolve_conflict_with_merge.xml
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
