Skip to content
Snippets Groups Projects

Update fixtures with ElementType allowed transcription

Merged Update fixtures with ElementType allowed transcription
fixtures-allowed-transcription into master
All threads resolved!
Merged Valentin Rigal requested to merge fixtures-allowed-transcription into master
All threads resolved!

Requires !770 (merged)
Part of #261 (closed)

Edited by Valentin Rigal

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Erwan RouchetErwan Rouchet 4 years ago (Jun 5, 2020 7:56am UTC)

Merge details

  • Changes merged into master with b8fccc8b (commits were squashed).
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Erwan Rouchet
  • Valentin Rigal added 8 commits

    added 8 commits

    Compare with previous version

    Toggle commit list
  • Bastien Abadie
    Bastien Abadie @babadie ·
    Owner

    Codecov Report

    Merging #772 into master will decrease coverage by 0.02%. The diff coverage is 76.47%.

    Impacted file tree graph

    @@            Coverage Diff             @@
##           master     #772      +/-   ##
==========================================
- Coverage   86.44%   86.42%   -0.03%     
==========================================
  Files         203      203              
  Lines       13589    13594       +5     
==========================================
+ Hits        11747    11748       +1     
- Misses       1842     1846       +4
    Impacted Files Coverage Δ
    ...ex/documents/management/commands/build_fixtures.py 0.00% <0.00%> (ø)
    arkindex/images/tests/test_image_elements.py 100.00% <ø> (ø)
    arkindex/documents/tests/test_corpus.py 100.00% <100.00%> (ø)
    arkindex/documents/tests/test_elements_api.py 100.00% <100.00%> (ø)
    ...index/documents/tests/test_transcription_create.py 100.00% <100.00%> (ø)

    Continue to review full report at Codecov.

    Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update b099b2d...93a3f8c. Read the comment docs.

    Edited by Bastien Abadie
  • Valentin Rigal resolved all threads

    resolved all threads

  • Valentin Rigal added 10 commits

    added 10 commits

    Compare with previous version

    Toggle commit list
  • Valentin Rigal added 30 commits

    added 30 commits

    • 148874b3...d0118656 - 2 commits from branch master
    • 667781da - Add allowed_transcription field to ElementType
    • d7d94781 - Allow line transcriptions for elements types containing line word in the migration
    • ee609f10 - Update TranscriptionCreate validation
    • bdc9eedd - Handle manual sources for created transcriptions
    • 02e0aaff - Do handle manual source in the DataSource serializer field
    • c0141d0e - Only allows for a manual transcription to be created
    • a3c989cd - Update manual transcription endpoint
    • 9fa69dfd - Update existing tests
    • f377c2e2 - Add tests
    • 6b4fb1d1 - Suggestions
    • e36f116d - Add blank=True to the migration as Django stores it as NULL (for admin form)
    • 9bc19160 - Add allowed transcription to ElementType serializer
    • 11baf208 - Update tests for corpus endpoint
    • e5d0f5a6 - Suggestion 2
    • cb836ef6 - Use element primary key as path arg
    • 0b6598a3 - Update tests
    • e46bdb2f - Complete tests
    • aedc7966 - Prevent duplicated queries
    • 8d1c1892 - Fixes and suggestions
    • 7c71aafb - Update fixtures build
    • 8ca22346 - Update fixtures data
    • 48d17b80 - Update existing tests
    • a21ce3e7 - Fixup build command
    • a0cde1ce - Fixup fixtures data
    • 4b5d2f45 - Update transcription create tests
    • 256acc91 - Merge conflict
    • 9673f075 - Suggestions
    • fd83ed08 - Update tests

    Compare with previous version

    Toggle commit list
  • Valentin Rigal added 11 commits

    added 11 commits

    Compare with previous version

    Toggle commit list
  • Erwan Rouchet enabled an automatic merge when the pipeline for 93a3f8c7 succeeds

    enabled an automatic merge when the pipeline for 93a3f8c7 succeeds

  • Erwan Rouchet canceled the automatic merge

    canceled the automatic merge

  • Erwan Rouchet merged

    merged

  • Erwan Rouchet mentioned in commit b8fccc8b

    mentioned in commit b8fccc8b

    • Please register or sign in to reply