CenterForOpenScience / angular-osf

81%

develop: 82%

LAST BUILD ON BRANCH fix/angular-upgrade-merge-conflicts

branch: fix/angular-upgrade-merge-conflicts

CHANGE BRANCH

x

Reset

Sync Branches

• fix/angular-upgrade-merge-conflicts
• ENG-9225
• ENG-9260
• FE-changes-for-freq-prefs
• bug/linkset-json-format
• chore/add-service-name-fallback
• chore/gha-cleanup
• chore/license
• chore/ssr-security-issue
• develop
• eng-10684
• feat/8975-redirect-service
• feat/ENG-10048
• feat/ENG-10108
• feat/ENG-10144
• feat/ENG-10560
• feat/ENG-10582
• feat/ENG-10626
• feat/ENG-10697
• feat/ENG-10698
• feat/ENG-10752
• feat/ENG-8545
• feat/ENG-8845
• feat/ENG-9290
• feat/ENG-9544
• feat/ENG-9556
• feat/ENG-9609
• feat/ENG-9631
• feat/ENG-9632
• feat/ENG-9643
• feat/ENG-9792
• feat/ENG-9817
• feat/ENG-9818
• feat/ENG-9827
• feat/ENG-9833
• feat/ENG-9951
• feat/chunk-imporvements
• feat/code-improvements
• feat/configure-citation-addons-redirect
• feat/coveralls
• feat/disable-prerender
• feat/existing-orcid
• feat/show-configured-addon-provider-icon
• feat/signposting
• feature/ENG---9957
• feature/ENG--10383
• feature/ENG-10047
• feature/ENG-10385
• feature/ENG-10707
• feature/ENG-6719
• feature/ENG-9043--v2
• feature/ENG-9731
• feature/active-flags
• feature/add-signposting-landing-pages
• feature/angular-upgrade
• feature/connect-orcid
• feature/disable-share-social-media
• feature/eng-11086
• feature/fair-signposting
• feature/gha
• feature/institutions_sso_filter
• feature/login-url
• feature/merge-develop
• feature/merge_develop
• feature/metadata-page-signposting
• feature/migration-to-vitest
• feature/notifications-refactor
• feature/orcid-integration
• feature/osf4i-in-progress-sso
• feature/pbs-25-24
• feature/pbs-25.02
• feature/pbs-25.03
• feature/pbs-25.04
• feature/pbs-26-2
• feature/pbs-26-6
• feature/pbs-26-9
• feature/poorly-worded
• feature/signposting-service
• fix-add-metadata-page
• fix-connected-addon-icon
• fix-discover-page-facet
• fix-licenses
• fix-only-public-project-collection
• fix-preprint-edit
• fix-project-forking
• fix-search
• fix-update-FE-for-NR
• fix/ENG--9242
• fix/ENG--9565
• fix/ENG--9618
• fix/ENG-10002
• fix/ENG-10032
• fix/ENG-10042
• fix/ENG-10050
• fix/ENG-10087
• fix/ENG-10139
• fix/ENG-10148
• fix/ENG-10217
• fix/ENG-10219
• fix/ENG-10262
• fix/ENG-10262-2
• fix/ENG-10288
• fix/ENG-10318
• fix/ENG-10320
• fix/ENG-10348
• fix/ENG-10371
• fix/ENG-10408
• fix/ENG-10414
• fix/ENG-10529
• fix/ENG-10544
• fix/ENG-10546
• fix/ENG-10553
• fix/ENG-10608
• fix/ENG-10695
• fix/ENG-10735
• fix/ENG-10770
• fix/ENG-10789
• fix/ENG-10790
• fix/ENG-10791
• fix/ENG-10803
• fix/ENG-10823
• fix/ENG-10829
• fix/ENG-10831
• fix/ENG-10866
• fix/ENG-10869
• fix/ENG-11004
• fix/ENG-11243
• fix/ENG-11333
• fix/ENG-11334
• fix/ENG-11358
• fix/ENG-7471
• fix/ENG-9042
• fix/ENG-9059
• fix/ENG-9071
• fix/ENG-9073
• fix/ENG-9078
• fix/ENG-9082
• fix/ENG-9157
• fix/ENG-9164
• fix/ENG-9166_fix-curator-permissions
• fix/ENG-9198
• fix/ENG-9234
• fix/ENG-9243
• fix/ENG-9255
• fix/ENG-9255-v2
• fix/ENG-9260
• fix/ENG-9260_Google-Drive-files-not-loading-once-root-folder-selected
• fix/ENG-9275
• fix/ENG-9511
• fix/ENG-9542
• fix/ENG-9608
• fix/ENG-9618
• fix/ENG-9623
• fix/ENG-9625
• fix/ENG-9627
• fix/ENG-9633
• fix/ENG-9637
• fix/ENG-9638
• fix/ENG-9639
• fix/ENG-9641
• fix/ENG-9644
• fix/ENG-9647_some-wiki-pages-never-load
• fix/ENG-9682
• fix/ENG-9683
• fix/ENG-9684
• fix/ENG-9685
• fix/ENG-9720
• fix/ENG-9722
• fix/ENG-9728
• fix/ENG-9732
• fix/ENG-9749
• fix/ENG-9768
• fix/ENG-9769
• fix/ENG-9770
• fix/ENG-9780
• fix/ENG-9788
• fix/ENG-9802
• fix/ENG-9802-v2
• fix/ENG-9807
• fix/ENG-9809
• fix/ENG-9810
• fix/ENG-9821
• fix/ENG-9835
• fix/ENG-9837
• fix/ENG-9838
• fix/ENG-9839
• fix/ENG-9917
• fix/ENG-9917-v2
• fix/ENG-9943
• fix/ENG-9955
• fix/ENG-9956
• fix/ENG-9958
• fix/ENG-9974
• fix/ENG_9260
• fix/addon-icon
• fix/addons-icons
• fix/angular-ssr-security
• fix/build-errors
• fix/center-logo
• fix/code-improvements
• fix/collection-fixes
• fix/config-for-ssr
• fix/contributors-table-tests
• fix/delete-button
• fix/develop-merge
• fix/drag-drop-files
• fix/drag-drop-single-file
• fix/eng-8553
• fix/eng-9072
• fix/eslint-rules-signals
• fix/files
• fix/fix-authenticated-ORCID-is-not-being-displayed
• fix/fix-authenticated-ORCID-is-not-displayed
• fix/fix-authenticated-ORCID-is-not-shown
• fix/login_redirect
• fix/logout_redirect
• fix/make-icon-of-preprint-and-collections-centered
• fix/make-mappers-use-fix-bad-ecoding
• fix/markdow-at-rules-update
• fix/merge-conflicts-pbs-26-9
• fix/merge-develop
• fix/merge-fixes
• fix/missing-language-for-adding-email-button
• fix/nav-menu-translations
• fix/notification-prefs
• fix/preprints-contributors-issue
• fix/project-storage
• fix/projects-do-not-open-on-collection-moderation-page
• fix/recent-activity-refactor
• fix/search-improvements
• fix/ssr-config
• fix/ssr-disable
• fix/ssr-routes
• fix/ssr-throttle-token
• fix/toast-z-index
• fix/ui-fixes
• fix/unable-to-rename-wiki
• fix/user-revieves-an-error-message-when-navigating-to-unloadable-addon
• hotfix-preprint-delete
• hotfix/25.3.1
• hotfix/25.4.1
• hotfix/25.4.2
• hotfix/25.4.3
• hotfix/26.1.1
• hotfix/26.1.2
• hotfix/26.10.1
• hotfix/26.11.1
• hotfix/26.2.1
• hotfix/26.2.2
• hotfix/26.5.1
• hotfix/26.6.1
• hotfix/26.8.1
• hotfix/26.8.2
• hotfix/26.9.1
• hotfix/26.9.2
• hotfix/ENG-10045
• hotfix/ENG-10909
• hotfix/ENG-11002
• hotfix/ENG-11147
• hotfix/metadata-records-service
• hotfix/nav-menu-translations
• hotfix/search-contributors-fix
• hotfix/ssr-fixes
• hotfix/updated-allowed-hosts
• logout-warning
• main
• merge/es2-consolidation-with-develop
• orcid-signout
• osf4i-in-progress-sso/merge_develop
• redirect-addon-bugfixes
• redirect-language-update
• refactor/ENG-11256
• refactor/configurable-api-root
• release/26.1.0
• release/26.10.0
• revert-736-ENG-9260
• revert-761-fix/notification-prefs
• revert-988-feat/ENG-9827
• test/ENG-9973
• test/new-unit-tests
• test/preprint-components-stepper
• test/preprint-pages
• test/preprints-details-components
• test/registry-overview
• tests/registries
• tests/registries-components
• tests/registries-metadata-components
• tests/skipped-tests
• tests/unit-tests-updates

Build # 24498910447

Build Type

Pull #953

github

Committed by web-flow

Commit Message

Merge fcab7d9f8 into 682f19c62

Pull Request Pull Request #953: Fix angular upgrade merge conflicts

Coverage Stats

9466 of 12701 branches covered (74.53%)

Branch coverage included in aggregate %.

39 of 39 new or added lines in 8 files covered. (100.0%)

16635 of 19566 relevant lines covered (85.02%)

7.67 hits per line