Gitlab Community Edition Instance

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

grady
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

1e7ae034

Commit 1e7ae034 authored 5 years ago by Dominik Seeger

Downloads
- Patches
- Plain Diff

Resolve "Reviewers can omit the final flag in conflict resolution"

parent 60977e94

1 merge request!234Resolve "Reviewers can omit the final flag in conflict resolution"

Pipeline #131063 passed 4 years ago

Stage: build

Stage: test

Stage: build_image

Changes 5
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

core/serializers/feedback.py 16 additions, 0 deletions

core/serializers/feedback.py
core/tests/test_feedback.py 64 additions, 9 deletions

core/tests/test_feedback.py
frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue 8 additions, 4 deletions

...ssion_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
frontend/src/store/modules/submission-notes.ts 9 additions, 0 deletions

frontend/src/store/modules/submission-notes.ts
functional_tests/test_feedback_creation.py 57 additions, 0 deletions

functional_tests/test_feedback_creation.py

with 154 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment