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.4 to master #488

Merged
merged 6 commits into from
Sep 7, 2023
Merged

Merge release/2.4 to master #488

merged 6 commits into from
Sep 7, 2023

Conversation

SwikritiT
Copy link
Collaborator

There were some conflicts while trying to merge release/2.4 branch to master so this PR resolves those conflicts to merge the changes from release branch to master

@SwikritiT SwikritiT mentioned this pull request Sep 6, 2023
Merged
SagarGi and others added 6 commits September 6, 2023 15:22
@SagarGi @SwikritiT
Update the troubleshooting link
26770f7 
Signed-off-by: sagargurung1001@gmail.com <sagargurung1001@gmail.com>
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
@wielinde @psatyal @SwikritiT
Update app description to contain latest changes (#473)
fe481c1 
Signed-off-by: Wieland Lindenthal <w.lindenthal@forkmerge.com>
Signed-off-by: Parimal Satyal <88370597+psatyal@users.noreply.github.com>
Co-authored-by: Parimal Satyal <88370597+psatyal@users.noreply.github.com>
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
@SagarGi @SwikritiT
Remove border and check for consistency in Workpackage
c211c39 
Signed-off-by: sagargurung1001@gmail.com <sagargurung1001@gmail.com>
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
@SwikritiT
Update the version of the app to 2.4.3
02eb7e1 
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
@SwikritiT
Use node 18 for release
7bef713 
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
@SwikritiT
Update the version of the app to 2.4.4
0a38687 
Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
@github-actions
Copy link

github-actions bot commented Sep 6, 2023

JS Code Coverage

Coverage after merging merge-release/2.4-to-master into master will be
87.93%
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.js63.64%33.33%50%66%10–14, 17–26, 6–9
src/components
   AdminSettings.vue99.29%95.60%85.19%99.91%1, 1, 1, 1, 1
   OAuthConnectButton.vue99.17%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.75%100%0%96.77%1
src/components/settings
   CheckBox.vue92.45%80%66.67%97.62%1, 1
   SettingsTitle.vue94.74%50%100%97.14%1, 1
src/components/tab
   EmptyContent.vue97.04%78.95%100%99.32%1, 1, 1, 33, 33
   SearchInput.vue99.19%88.89%80%100%1
   WorkPackage.vue98.36%40%100%99.33%1, 1, 1, 43, 43
src/utils
   workpackageHelper.js94.21%88%100%95.65%17–19, 48, 48–50
src/views
   Dashboard.vue98.97%71.43%100%99.65%1, 1, 1
   ProjectsTab.vue99.74%93.75%100%100%23
   WorkPackagePickerElement.vue0%0%0%0%1, 1, 10–19, 2, 20–29, 3, 30–39, 4, 40–49, 5, 50–59, 6, 60–69, 7, 70–79, 8, 80–89, 9, 90–96
   WorkPackageReferenceWidget.vue0%0%0%0%1, 1, 10, 100–109, 11, 110–119, 12, 120–129, 13, 130–132, 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
Copy link

github-actions bot commented Sep 6, 2023

PHP Code Coverage

Coverage after merging merge-release/2.4-to-master into master will be
56.21%
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.11%100%25%9.38%100, 102–104, 108–111, 113, 117–122, 133, 137, 69–71, 74, 78, 81, 85, 87, 91, 96, 98–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.69%100%50%63.39%134, 151–152, 154, 156–158, 160–161, 166–167, 169, 217, 278, 367–368, 371–372, 378–380, 506–509, 511–512, 515, 523, 534, 548–550, 565–569, 571–572, 574–577, 579–581, 583–585, 587–589, 607–612, 614–615, 617–619, 622, 624–627, 629–631, 633–635, 637–639, 653, 662–665, 667–670, 680–685
   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.php74.53%100%85.71%73.74%232–233, 284, 290–294, 297–299, 301, 303, 314–316, 319–320, 322–323, 327–330, 333, 339
   OpenProjectAPIController.php82.27%100%73.33%82.93%138, 175, 192–195, 199, 203, 205–210, 212, 221–224, 227, 229, 231–234, 236–237, 242, 254, 263, 281, 290, 555, 557, 95
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%40–42, 46–51, 53–58, 60, 62, 66
   BeforeUserDeletedListener.php0%100%0%0%48, 55–56, 58–61
   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.php70.31%100%70.73%70.26%1000, 1003, 1009, 1014, 1018, 1028, 1030, 1033, 1035, 1166–1173, 1175, 1183–1187, 1195–1202, 1219–1226, 1235–1240, 180–184, 255, 364–365, 367, 381–382, 391, 395, 416,

@SwikritiT SwikritiT merged commit e527cb6 into master Sep 7, 2023
16 checks passed
@delete-merged-branch delete-merged-branch bot deleted the merge-release/2.4-to-master branch September 7, 2023 03:39
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

@SagarGi SagarGi Awaiting requested review from SagarGi

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