MarkUsProject / Markus

92%

master: 92%

LAST BUILD ON BRANCH ISSUE-7687_remove_criteria_level_naming_conflicts

branch: ISSUE-7687_remove_criteria_level_naming_conflicts

CHANGE BRANCH

x

Reset

• ISSUE-7687_remove_criteria_level_naming_conflicts
• 7642
• 7674
• ISSUE-7677_display_late_penalty_selection
• add-data-testid-to-name-search
• add-erb_lint
• add-scheduled-assessment-visibility
• annotation-category-to-json-tests
• annotations-overall-comments-style-updates
• api_collect_submission
• assign-grader-querying
• assign_scans_inactive_students
• assignment-group-use-dialog
• assignment-summary
• assignment-summary-v2
• assignment-view-students
• autotest-seed-py-marks-metadata
• autotest-testing
• autotester_pass_tags_comments
• bump-rubocop
• cache-apt
• cache-playwright-chromium
• ci_parallel
• clean-up-javascript
• clean_tmp_job_mtime
• convert-v8-react-table
• create-group-react-component
• create_tag_fix
• dashboard-query
• decouple-matching-from-scanning
• dependabot.yml-updates
• dependabot/bundler/action_policy-0.7.3
• dependabot/bundler/action_policy-0.7.5
• dependabot/bundler/actionpack-7.2.2.1
• dependabot/bundler/activerecord-8.0.2.1
• dependabot/bundler/activerecord-session_store-2.2.0
• dependabot/bundler/autoprefixer-rails-10.4.21.0
• dependabot/bundler/bootsnap-1.18.6
• dependabot/bundler/brakeman-7.0.0
• dependabot/bundler/brakeman-7.0.2
• dependabot/bundler/bullet-8.0.1
• dependabot/bundler/bullet-8.0.5
• dependabot/bundler/bullet-8.0.8
• dependabot/bundler/cgi-0.4.2
• dependabot/bundler/combine_pdf-1.0.29
• dependabot/bundler/combine_pdf-1.0.31
• dependabot/bundler/config-5.6.1
• dependabot/bundler/cssbundling-rails-1.4.3
• dependabot/bundler/csv-3.3.2
• dependabot/bundler/csv-3.3.3
• dependabot/bundler/csv-3.3.4
• dependabot/bundler/csv-3.3.5
• dependabot/bundler/debug-1.10.0
• dependabot/bundler/debug-1.11.0
• dependabot/bundler/dry-validation-1.11.1
• dependabot/bundler/exception_notification-5.0.1
• dependabot/bundler/factory_bot_rails-6.5.0
• dependabot/bundler/i18n-1.14.7
• dependabot/bundler/i18n-tasks-1.0.15
• dependabot/bundler/js-routes-2.3.3
• dependabot/bundler/js-routes-2.3.4
• dependabot/bundler/js-routes-2.3.5
• dependabot/bundler/json-2.10.2
• dependabot/bundler/json-2.12.2
• dependabot/bundler/json-2.13.2
• dependabot/bundler/json-2.9.1
• dependabot/bundler/jwt-2.10.1
• dependabot/bundler/marcel-1.1.0
• dependabot/bundler/multi-59e81ae8b4
• dependabot/bundler/net-imap-0.5.7
• dependabot/bundler/nokogiri-1.18.3
• dependabot/bundler/nokogiri-1.18.4
• dependabot/bundler/nokogiri-1.18.8
• dependabot/bundler/nokogiri-1.18.9
• dependabot/bundler/pg-1.6.1
• dependabot/bundler/puma-6.6.0
• dependabot/bundler/puma-6.6.1
• dependabot/bundler/rack-3.1.10
• dependabot/bundler/rack-3.1.11
• dependabot/bundler/rack-3.1.12
• dependabot/bundler/rack-3.1.14
• dependabot/bundler/rack-3.1.16
• dependabot/bundler/rack-3.2.2
• dependabot/bundler/rack-3.2.3
• dependabot/bundler/rack-cors-3.0.0
• dependabot/bundler/rack-session-2.1.1
• dependabot/bundler/rails-8.0.3
• dependabot/bundler/rails-i18n-7.0.10
• dependabot/bundler/rails-i18n-8.0.2
• dependabot/bundler/rails_performance-1.4.1
• dependabot/bundler/rails_performance-1.4.2
• dependabot/bundler/redcarpet-3.6.1
• dependabot/bundler/redis-5.4.0
• dependabot/bundler/redis-5.4.1
• dependabot/bundler/resque-2.7.0
• dependabot/bundler/resque-scheduler-4.11.0
• dependabot/bundler/rmagick-6.1.1
• dependabot/bundler/rmagick-6.1.2
• dependabot/bundler/rspec-rails-7.1.0
• dependabot/bundler/rspec-rails-7.1.1
• dependabot/bundler/rspec-rails-8.0.0
• dependabot/bundler/rspec-rails-8.0.1
• dependabot/bundler/rspec-rails-8.0.2
• dependabot/bundler/rubyzip-2.4.1
• dependabot/bundler/rubyzip-3.0.2
• dependabot/bundler/rugged-1.9.0
• dependabot/bundler/selenium-webdriver-4.28.0
• dependabot/bundler/selenium-webdriver-4.30.1
• dependabot/bundler/selenium-webdriver-4.33.0
• dependabot/bundler/selenium-webdriver-4.34.0
• dependabot/bundler/selenium-webdriver-4.35.0
• dependabot/bundler/shoulda-matchers-6.5.0
• dependabot/bundler/simplecov-lcov-0.9.0
• dependabot/bundler/sinatra-4.1.0
• dependabot/bundler/sinatra-4.2.0
• dependabot/bundler/sprockets-4.2.2
• dependabot/bundler/terser-1.2.5
• dependabot/bundler/terser-1.2.6
• dependabot/bundler/thor-1.4.0
• dependabot/bundler/webmock-3.25.1
• dependabot/npm_and_yarn/babel-006c0f2cd0
• dependabot/npm_and_yarn/babel-5d6dcf491f
• dependabot/npm_and_yarn/babel-83e862f966
• dependabot/npm_and_yarn/babel-90202a9766
• dependabot/npm_and_yarn/babel-94fd5226d3
• dependabot/npm_and_yarn/babel-b74abc64a9
• dependabot/npm_and_yarn/babel-d88eda60e7
• dependabot/npm_and_yarn/babel-f26d23b75e
• dependabot/npm_and_yarn/babel-jest-30.0.2
• dependabot/npm_and_yarn/babel-jest-30.0.5
• dependabot/npm_and_yarn/chart.js-4.4.8
• dependabot/npm_and_yarn/chart.js-4.4.9
• dependabot/npm_and_yarn/chart.js-4.5.0
• dependabot/npm_and_yarn/core-js-3.40.0
• dependabot/npm_and_yarn/core-js-3.41.0
• dependabot/npm_and_yarn/core-js-3.42.0
• dependabot/npm_and_yarn/core-js-3.43.0
• dependabot/npm_and_yarn/dompurify-3.2.3
• dependabot/npm_and_yarn/dompurify-3.2.4
• dependabot/npm_and_yarn/dompurify-3.2.6
• dependabot/npm_and_yarn/fortawesome-5f4d1e9add
• dependabot/npm_and_yarn/fortawesome-bd9870f41a
• dependabot/npm_and_yarn/i18n-js-4.5.1
• dependabot/npm_and_yarn/jest-30.0.3
• dependabot/npm_and_yarn/jest-30.0.5
• dependabot/npm_and_yarn/jest-environment-jsdom-30.0.2
• dependabot/npm_and_yarn/marked-15.0.12
• dependabot/npm_and_yarn/marked-15.0.6
• dependabot/npm_and_yarn/marked-15.0.7
• dependabot/npm_and_yarn/marked-16.0.0
• dependabot/npm_and_yarn/mime-4.0.6
• dependabot/npm_and_yarn/mime-4.0.7
• dependabot/npm_and_yarn/nanoid-3.3.8
• dependabot/npm_and_yarn/pdfjs-dist-4.10.38
• dependabot/npm_and_yarn/pdfjs-dist-5.3.31
• dependabot/npm_and_yarn/pdfjs-dist-5.4.149
• dependabot/npm_and_yarn/prismjs-1.30.0
• dependabot/npm_and_yarn/rails-176e0686ff
• dependabot/npm_and_yarn/rails-261bb587fc
• dependabot/npm_and_yarn/rails-35bce351a2
• dependabot/npm_and_yarn/rails-bf8a19ee32
• dependabot/npm_and_yarn/react-flatpickr-4.0.0
• dependabot/npm_and_yarn/react-flatpickr-4.0.10
• dependabot/npm_and_yarn/rjsf-08241e480f
• dependabot/npm_and_yarn/rjsf-202d0d6297
• dependabot/npm_and_yarn/rjsf-7ad2f758b5
• dependabot/npm_and_yarn/rjsf-7ed21e9566
• dependabot/npm_and_yarn/rjsf-b312aebfc4
• dependabot/npm_and_yarn/rjsf-d7481262e0
• dependabot/npm_and_yarn/rjsf-df087e2f41
• dependabot/npm_and_yarn/sass-1.83.4
• dependabot/npm_and_yarn/sass-1.85.1
• dependabot/npm_and_yarn/sass-1.87.0
• dependabot/npm_and_yarn/sass-1.89.1
• dependabot/npm_and_yarn/sass-1.89.2
• dependabot/npm_and_yarn/sass-loader-16.0.4
• dependabot/npm_and_yarn/sass-loader-16.0.5
• dependabot/npm_and_yarn/testing-library/react-16.3.0
• dependabot/npm_and_yarn/testing-library/user-event-14.6.1
• dependabot/npm_and_yarn/webpack-5.101.0
• dependabot/npm_and_yarn/webpack-5.97.1
• dependabot/npm_and_yarn/webpack-5.99.9
• dependabot/npm_and_yarn/webpack-cli-6.0.1
• dependabot/pip/mistune-3.1.1
• dependabot/pip/mistune-3.1.2
• dependabot/pip/mistune-3.1.3
• dependabot/pip/nbconvert-7.16.6
• dependabot/pip/playwright-1.49.1
• dependabot/pip/playwright-1.50.0
• dependabot/pip/playwright-1.51.0
• dependabot/pip/playwright-1.52.0
• dependabot/pip/playwright-1.53.0
• dependabot/pip/playwright-1.54.0
• dependabot/pip/playwright-1.55.0
• dependabot/pip/zxing-cpp-2.3.0
• docker-dependency-update-service
• enable_remove_student
• extra-mark-percentage-of-score
• file_viewer_optional_render_microsoft_files
• fix-api-submission-files-binary
• fix-assignment-summary-group-filter
• fix-content-shift
• fix-flaky-test
• fix-foreign-key-violation-deleting-sections
• fix-n+1-SQL-query
• fix-rack-deprecation-warnings
• fix-remote-auth-login-button-spacing
• fix-test-result-table-extra-info-display
• fix-url-viewer-rendering
• fix/rubric-criterion-denominator
• fix_branch_part_2
• get_orphaned_users
• github-actions-permissions-block
• graders-name-search
• group-name-generation
• host_authorization_config
• icons-for-edit-delete
• image-viewer-fixes
• image_annotations_from_test_runs
• implement-late-penalties
• improve-assignment-settings-form
• improve-split-pdf-job-efficiency
• improve-table-no-data-ui
• improve_assignment_settings_form
• improve_pull_request_template
• improvement_to_pull_request_template
• increase-test-coverage-criteria-controller
• keybind-loading
• maintain_font_size_grading_view
• markdown-html-preview
• marks-graders-controller-tests
• master
• new-edit-update-rspec-tests
• npm-upkeep
• patch-1
• pin-mistune-lt-3.1
• pre-commit-ci-update-config
• precommmit_changes_update
• prevent_grade_change_from_scroll_arrowkey
• py-test-seed-files-add-custom-markers-example
• python_autotester_requirements_file
• qr_scanning_refactor
• quercus_cannot_create_course
• r-tester-file-metadata
• rails-v7.2.2.1
• rails-v8.0.2.1
• react-dropdownmenu
• react-table-v8-assignment-summary
• react-table-v8-migrate
• react-v18
• refactor-context-menu
• refactor-criterion-subclasses
• refactor-enzyme-to-rtl
• refactor-file-viewer
• refactor-markspanel-components
• release
• release_2.7.0
• release_2.8.0
• remove-activerecord-session_store
• remove-mistune
• rename-group-dialog
• renaming-jupyter-notebook-functions
• replace-moment-with-dayjs
• resque_host_authorization
• result-context-refactor
• rubocop-rails-v2.33.4
• section-starter-file-groups-fix
• setup_env_notice_flash_style_update
• solution-table-master
• table-loading
• tag_uniqueness_constraint
• test-message-refactor
• test_new_and_create_freya
• test_results_group_by_test_id
• toggle-download-test-button
• update-assignment-status-column
• update-assignment-summary-page
• update-compose.yaml
• update-contributors
• update-deps
• update-seed-autotest-schema-python-versions
• update_remote_autotest_settings_id_validation
• upload-scanned-test-refactoring
• users-table-refactor
• v2.7.1
• v2.8.1
• v2.8.2
• webpack-improvements
• zip

Build # 18546551874

Build Type

Pull #7696

github

Committed by web-flow

Commit Message

Merge 04826e0a9 into 5caac74af

Pull Request Pull Request #7696: ISSUE-7687: Remove criteria UPDATE conflicts

Run Details

782 of 1640 branches covered (47.68%)

Branch coverage included in aggregate %.

24 of 24 new or added lines in 2 files covered. (100.0%)

42513 of 45665 relevant lines covered (93.1%)

120.8 hits per line