Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/2.5 into master #548

Merged
merged 7 commits into from
Dec 13, 2023
Merged

Merge release/2.5 into master #548

merged 7 commits into from
Dec 13, 2023

Conversation

SagarGi
Copy link
Collaborator

@SagarGi SagarGi commented Dec 13, 2023 •
edited
Loading

Description

Merge release/2.5 into master

Note: DCO is failed since the merged commit is not signed off.

SagarGi and others added 7 commits December 8, 2023 16:35
@SagarGi
Update the versions of the integration app
e85886d 
Signed-off-by: sagargurung1001@gmail.com <sagargurung1001@gmail.com>
@SagarGi
Change app version to 2.5.0 (#543)
47e1ba3 
Signed-off-by: sagargurung1001@gmail.com <sagargurung1001@gmail.com>
@SagarGi
Allow transifex to write on release 2.5 branch (#546)
e136931 
Signed-off-by: sagargurung1001@gmail.com <sagargurung1001@gmail.com>
@SwikritiT @rakekniven
fix(i18n): Changed spelling of product name "Nextcloud" (#542)
8a95244 
Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
Co-authored-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
@nextcloud-bot
Fix(l10n): Update translations from Transifex
171e339 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
@SagarGi
Change app version to 2.5.1
1be011c 
Signed-off-by: sagargurung1001@gmail.com <sagargurung1001@gmail.com>
@individual-it
Merge pull request #547 from nextcloud/change_version
eb54a98 
Change app version to 2.5.1
@github-actions GitHub Actions
Copy link

JS Code Coverage

Coverage after merging release/2.5 into master will be
86.55%
Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
src
   adminSettings.js0%0%0%0%1, 1, 10–19, 2, 20–25, 3–9
   bootstrap.js0%0%0%0%1, 1–7
   dashboard.js0%0%0%0%1, 1, 10–19, 2, 20–25, 3–9
   fileActions.js0%0%0%0%1, 1, 10–17, 2–9
   personalSettings.js0%0%0%0%1, 1, 10–19, 2, 20–25, 3–9
   projectTab.js0%0%0%0%1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–66, 7–9
   reference.js0%0%0%0%1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60, 7–9
   utils.js66.67%33.33%50%69.09%10–14, 17–26, 6–9
src/components
   AdminSettings.vue99.29%95.60%85.19%99.91%1, 1, 1, 1, 1
   OAuthConnectButton.vue99.21%87.50%100%100%1
   PersonalSettings.vue98.87%93.33%85.71%100%1
src/components/admin
   FieldValue.vue97.12%83.33%100%98.89%1, 23, 23
   FormHeading.vue97.66%75%100%99.36%1, 1, 34, 34
   ProjectFolderError.vue96.83%80%100%98.21%1, 1
   TextInput.vue99.25%95%88.89%100%1
src/components/icons
   ClippyIcon.vue93.18%50%50%97.50%1, 1
   OpenProjectIcon.vue93.02%50%50%97.44%1, 1
src/components/settings
   CheckBox.vue92.45%80%66.67%97.62%1, 1
   SettingsTitle.vue91.11%50%100%94.87%1, 1, 10, 10
src/components/tab
   EmptyContent.vue96.09%72.73%100%99.35%1, 1, 1, 1, 1, 34, 34
   SearchInput.vue99.23%94.74%77.78%100%1
   WorkPackage.vue98.43%40%100%99.36%1, 1, 1, 43, 43
src/filesPlugin
   filesPlugin.js0%0%0%0%1, 1, 10, 100–104, 11–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–79, 8, 80–89, 9, 90–99
   filesPluginLessThan28.js0%0%0%0%1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–78, 8–9
src/utils
   workpackageHelper.js93.39%91.11%88.89%94.15%153–154, 18–20, 49, 49–51, 94–99
src/views
   CreateWorkPackageModal.vue98.22%92.59%40%99.84%1, 1, 1
   Dashboard.vue98.97%71.43%100%99.65%1, 1, 1
   LinkMultipleFilesModal.vue99.67%94.12%100%100%1
   ProjectsTab.vue99.74%93.75%100%100%23
   WorkPackagePickerElement.vue0%0%0%0%1, 1, 10, 100–109, 11, 110–119, 12, 120–129, 13, 130–139, 14, 140–149, 15, 150–151, 16–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–79, 8, 80–89, 9, 90–99
   WorkPackageReferenceWidget.vue0%0%0%0%1, 1, 10, 100–109, 11, 110–119, 12, 120–129, 13, 130–134, 14–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–79, 8, 80–89, 9, 90–99

@github-actions GitHub Actions
Copy link

PHP Code Coverage

Coverage after merging release/2.5 into master will be
58.57%
Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
server/apps/integration_openproject/lib
   Capabilities.php0%100%0%0%19, 26–29
server/apps/integration_openproject/lib/AppInfo
   Application.php11.43%100%25%9.68%101–104, 108–111, 113, 117–122, 133, 137, 70–72, 75, 79, 81, 84, 88, 90, 94, 99
server/apps/integration_openproject/lib/BackgroundJob
   RemoveExpiredDirectUploadTokens.php0%100%0%0%42, 44–46, 55–56
server/apps/integration_openproject/lib/Controller
   ConfigController.php62.59%100%50%63.28%134, 151–152, 154, 156–158, 160–161, 166–167, 169, 217, 278, 367–368, 371–372, 378–380, 420, 508–511, 513–514, 517, 525, 536, 550–552, 567–571, 573–574, 576–579, 581–583, 585–587, 589–591, 609–614, 616–617, 619–621, 624, 626–629, 631–633, 635–637, 639–641, 655, 664–667, 669–672, 682–687
   DirectDownloadController.php0%100%0%0%36–38, 53–55, 57, 60–61
   DirectUploadController.php71.43%100%100%70.43%131–132, 177, 190, 194–197, 199, 209, 216, 232–234, 236–237, 240–242, 248, 250, 255–256, 263–264, 267–268, 271–272, 288–289, 309, 314, 320
   FilesController.php77%100%85.71%76.34%223–224, 277, 283, 285–287, 289, 291, 302–304, 307–308, 310–311, 315–318, 321, 327
   OpenProjectAPIController.php83.87%100%80%84.17%139, 180, 204, 230–233, 236, 238, 240–243, 245–246, 251, 263, 272, 290, 299, 367, 369, 419, 421, 441, 443, 490, 492, 518–521, 524–528, 530, 735, 737, 96
server/apps/integration_openproject/lib/Dashboard
   OpenProjectWidget.php0%100%0%0%101–102, 104–108, 116, 123–124, 126, 128–129, 131–132, 134, 137–138, 140–141, 143, 69–73, 80, 87, 94
server/apps/integration_openproject/lib/Exception
   OpenprojectErrorException.php100%100%100%100%
   OpenprojectFileNotUploadedException.php100%100%100%100%
   OpenprojectGroupfolderSetupConflictException.php100%100%100%100%
   OpenprojectResponseException.php100%100%100%100%
   OpenprojectUnauthorizedUserException.php0%100%0%0%16
server/apps/integration_openproject/lib/Listener
   BeforeGroupDeletedListener.php0%100%0%0%48, 56–57, 60–63
   BeforeNodeInsideOpenProjectGroupfilderChangedListener.php0%100%0%0%41–43, 47–52, 54, 57–58, 60–65, 67, 69, 73
   BeforeUserDeletedListener.php0%100%0%0%48, 55–56, 58–61
   LoadAdditionalScriptsListener.php0%100%0%0%17–18, 21–25
   LoadSidebarScript.php0%100%0%0%100, 102, 104, 106–108, 110, 112, 114–115, 117–118, 120, 122, 75–81, 83–84, 86–87, 89–90, 96–97, 99
   OpenProjectReferenceListener.php0%100%0%0%53–54, 58–59, 62–63, 65, 67
   UserChangedListener.php0%100%0%0%52, 59–60, 63–68
server/apps/integration_openproject/lib/Migration
   Version2001Date20221213083550.php0%100%0%0%47, 57, 60, 63, 67, 70, 73, 77–79, 81
   Version2310Date20230116153411.php0%100%0%0%46, 49–52, 54–56, 60, 64, 68, 72, 76, 81–82, 84
   Version2400Date20230504144300.php0%100%0%0%47, 57, 60
server/apps/integration_openproject/lib/Reference
   WorkPackageReferenceProvider.php17.02%100%10%18.92%102, 109–112, 115–117, 120, 127–130, 132, 134–136, 138, 140, 142, 146, 155, 163–164, 172, 52, 59, 66, 73–74
server/apps/integration_openproject/lib/Search
   OpenProjectSearchProvider.php0%100%0%0%103–104, 107–114, 116–118, 121–122, 124–125, 129–134, 140–141, 143, 66–69, 76, 83, 91, 93, 96
   OpenProjectSearchResultEntry.php100%100%100%100%
server/apps/integration_openproject/lib/Service
   DatabaseService.php43.90%100%60%41.67%125–128, 131, 80–87, 89–93, 95–97
   DirectDownloadService.php88%100%100%86.96%65–66, 68
   DirectUploadService.php54.55%100%66.67%52.63%112, 118, 79–82, 84, 89, 91
   OauthService.php0%100%0%0%108–115, 45–47, 56–66, 68, 70–72, 75–78, 89, 91–94, 96–97
   OpenProjectAPIService.php73.45%100%72.34%73.55%1002, 1020, 1022, 1028, 1033, 1037, 1048–1049, 1188–1195, 1197, 1205–1209,

@individual-it individual-it merged commit 9f6496f into master Dec 13, 2023
20 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@individual-it individual-it individual-it approved these changes

@SwikritiT SwikritiT SwikritiT approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@SagarGi @individual-it @SwikritiT @nextcloud-bot