Patrick Schratz
463e144d97
Update redis library to support redis v7 ( #24114 ) ( #24156 )
...
backports #24114
---------
Co-authored-by: techknowlogick <hello@techknowlogick.com>
2023-04-17 02:34:59 -04:00
wxiaoguang
2b32f8b95f
Sort repo topic labels by name ( #24123 ) ( #24153 )
...
Backport #24123
Close #24077
Manually backported and tested.
<img width="330" alt="image"
src="https://user-images.githubusercontent.com/2114189/232283645-92cc85dd-ba16-44a9-a7ef-5712b9d285e9.png ">
2023-04-17 09:00:19 +08:00
wxiaoguang
94fbd44bac
Set EasyMDE heading font-size to the same size as the resulting markdown ( #24151 ) ( #24152 )
...
Backport #24151
Fix #23816
<img width="519" alt="image"
src="https://user-images.githubusercontent.com/2114189/232283304-21f56e82-d80e-4199-9b14-74699d80cd20.png ">
2023-04-16 17:34:19 -04:00
Giteabot
494e373292
Fix 2-dot direct compare to use the right base commit ( #24133 ) ( #24150 )
...
Backport #24133 by @jtran
For 2-dot direct compare, we should use the base commit in the title and
templates, as is used elsewhere, not the common ancestor which is used
for 3-dot compare. I believe that this change should have been included
in #22949 .
Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
2023-04-16 13:17:13 +02:00
sillyguodong
10f93995e9
Highlight selected file in the PR file tree ( #23947 ) ( #24126 )
...
backport #23947 by @yusifeng
before
after
Co-authored-by: yusifeng <36984894+yusifeng@users.noreply.github.com>
2023-04-14 17:54:22 +08:00
Giteabot
67a73dd05f
Fix incorrect server error content in RunnersList ( #24118 ) ( #24121 )
...
Backport #24118 by @yp05327
Co-authored-by: yp05327 <576951401@qq.com>
2023-04-14 12:52:21 +08:00
Zettat123
893c97dd71
Fix mismatch between hook events and github event types ( #24048 ) ( #24091 )
...
Backport https://github.com/go-gitea/gitea/pull/24048
Some workflow trigger events can have multiple activity types, such as
`issues` and `pull_request`, and user can specify which types can
trigger the workflow. See GitHub documentation:
https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows
Now some hook events cannot match the workflow trigger events correctly
because we don't check the activity types. For example,
`pull_request_label` is an individual hook event. But there isn't a
`pull_request_label` workflow trigger event, we can only use
`pull_request` event's `label` activity type. If we don't check the
activity types, the workflows without the `label` activity type may be
triggered by the `pull_request_label` event by mistake. We need to
improve the match logic.
- [x] [`issues`
](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issues )
- [x]
[`issue_comment`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issue_comment )
- [x]
[`pull_request`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request )
- [x]
[`pull_request_review`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review )
- [x]
[`pull_request_review_comment`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review_comment )
- [x]
[`release`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release )
- [x]
[`registry_package`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#registry_package )
2023-04-13 15:19:41 +08:00
6543
447fa6715c
Changelog v1.19.1 ( #24079 )
2023-04-13 03:38:06 +02:00
wxiaoguang
2398a23562
Backport locales to 1.19 ( #24083 )
...
Backport locales
Generated by `go run build/backport-locales.go release/v1.19`
2023-04-12 17:07:43 -04:00
Giteabot
93c7611c32
Improve LFS error logs ( #24072 ) ( #24082 )
...
Backport #24072 by @wxiaoguang
The error logs were not clear.
Help (but not fix) #24053
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-12 16:23:57 -04:00
Giteabot
607801ec41
Update the value of the diffEnd when click Show More btn in the DiffFileTree ( #24069 ) ( #24078 )
...
Backport #24069 by @sillyguodong
In the component `DiffFileTree`,if don't update the value of the
`diffEnd` in the callback of ajax request, click `Show More` btn will
always return the same response, duplicate files are appended to the
file list.
Before:
https://user-images.githubusercontent.com/33891828/231371188-82d169af-10bb-47e2-8aca-83ced2597f2d.mov
After:
https://user-images.githubusercontent.com/33891828/231369805-39a5a4d0-662c-4f08-bc5a-7d31e8782453.mov
Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
2023-04-12 15:27:53 -04:00
wxiaoguang
16d2cf05ab
Fix custom mailer template on Windows ( #24081 )
...
Fix #24075
Fix #23873
From the log:
```
2023/04/02 19:41:46 .../templates/mailer.go:68:1() [T] Adding mailer template for \issue\default from "C:\gitea\custom\templates\mail\issue\default.tmpl"
```
That `assetName ` on Windows is wrong. Gitea only uses slash `/`.
2023-04-12 12:16:40 -04:00
wxiaoguang
d562b419b6
Make label templates have consistent behavior and priority ( #23749 ) ( #24071 )
...
Backport #23749
Fix https://github.com/go-gitea/gitea/issues/23715
Backported manually and tested manually.
2023-04-12 16:05:10 +02:00
Hester Gong
5482602ba8
Add cardtype to org/user level project on creation, edit and view ( #24043 ) ( #24066 )
...
Backport #24043
Part of #23318
The way to fix the missing cardtype for user/org level projects in this
PR is to port the cardtype related part from #22112 to org/user level
projects' template and router functions.
Before:
<img width="1135" alt="截屏2023-04-11 13 55 49"
src="https://user-images.githubusercontent.com/17645053/231069068-ba897129-ae90-4aa0-9b0f-468bf5c65375.png ">
<img width="1131" alt="截屏2023-04-11 13 55 59"
src="https://user-images.githubusercontent.com/17645053/231069084-279f6681-5a10-42da-b5a8-2b0ba47c7078.png ">
After:
Create
<img width="835" alt="截屏2023-04-11 13 27 16"
src="https://user-images.githubusercontent.com/17645053/231064445-0d6e12bd-5725-48db-a102-80e7472757c2.png ">
Edit
<img width="852" alt="截屏2023-04-11 13 27 05"
src="https://user-images.githubusercontent.com/17645053/231064503-c70525cd-1038-43ec-8d93-8b8d95d183d4.png ">
View
<img width="1329" alt="截屏2023-04-11 13 26 56"
src="https://user-images.githubusercontent.com/17645053/231064529-26023c85-698b-4b2e-af02-45f9820c77ec.png ">
---------
Co-authored-by: silverwind <me@silverwind.io>
2023-04-12 08:23:05 -04:00
Giteabot
37d3e0ec33
Fix accidental overwriting of LDAP team memberships ( #24050 ) ( #24065 )
...
Backport #24050 by @sillyguodong
In the `for` loop, the value of `membershipsToAdd[org]` and
`membershipsToRemove[org]` is a slice that should be appended instead of
overwritten.
Due to the current overwrite, the LDAP group sync only matches the last
group at the moment.
## Example reproduction
- an LDAP user is both a member of
`cn=admin_staff,ou=people,dc=planetexpress,dc=com` and
`cn=ship_crew,ou=people,dc=planetexpress,dc=com`.
- configuration of `Map LDAP groups to Organization teams ` in
`Authentication Sources`:
```json
{
"cn=admin_staff,ou=people,dc=planetexpress,dc=com":{
"test_organization":[
"admin_staff",
"test_add"
]
},
"cn=ship_crew,ou=people,dc=planetexpress,dc=com":{
"test_organization":[
"ship_crew"
]
}
```
- start `Synchronize external user data` task in the `Dashboard`.
- the user was only added for the team `test_organization.ship_crew`
Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
2023-04-12 07:22:02 -04:00
Denys Konovalov
29724f31c5
Refactor commit status for Actions jobs ( #23786 ) ( #24060 )
...
Backport #23786
Refactor commit status for Actions jobs (#23786 )
Highlights:
- Treat `StatusSkipped` as `CommitStatusSuccess` instead of
`CommitStatusFailure`, so it fixed #23599 .
- Use the bot user `gitea-actions` instead of the trigger as the creator
of commit status.
- New format `<run_name> / <job_name> / (<event>)` for the context of
commit status to avoid conflicts.
- Add descriptions for commit status.
- Add the missing calls to `CreateCommitStatus`.
- Refactor `CreateCommitStatus` to make it easier to use.
Co-authored-by: Jason Song <i@wolfogre.com>
2023-04-11 22:37:34 -04:00
Giteabot
580da8f353
Fix branch protection priority ( #24045 ) ( #24061 )
...
Backport #24045 by @lunny
Fix #24044
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-11 21:07:38 +02:00
Giteabot
8644993699
Update documentation to explain which projects allow Gitea to host static pages ( #23993 ) ( #24058 )
...
Backport #23993 by @6543
close #23521
Signed-off-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: a1012112796 <1012112796@qq.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-11 18:43:35 +02:00
Jason Song
f55fe989a4
Use actions job link as commit status URL instead of run link ( #24023 ) ( #24032 )
...
Backport #24023 .
A commit status is bound to a job, not a run.
2023-04-10 08:46:36 -05:00
Giteabot
27dbe97542
Add actions support to package auth verification ( #23729 ) ( #24028 )
...
Backport #23729 by @yp05327
Partly fixes https://github.com/go-gitea/gitea/issues/23642
Error info:
ActionsUser (userID -2) is used to login in to docker in action jobs.
Due to we have no permission policy settings of ActionsUser now,
ActionsUser can only access public registry by this quick fix.
Co-authored-by: yp05327 <576951401@qq.com>
2023-04-10 10:36:21 +02:00
Giteabot
abf0386e2e
Fix protected branch for API ( #24013 ) ( #24027 )
...
Backport #24013 by @lunny
Fix #23998
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-10 14:48:02 +08:00
Giteabot
2b10eebed8
Show errors for KaTeX and mermaid on the preview tab ( #24009 ) ( #24019 )
...
Backport #24009 by @silverwind
There is a conflicting fomantic rule that hid the error messages inside
the markdown preview tab for things like mermaid or katex. Overruled it
to always show these errors.
<img width="774" alt="image"
src="https://user-images.githubusercontent.com/115237/230738528-322814c1-8994-495e-b901-bbb79b924ccb.png ">
Co-authored-by: silverwind <me@silverwind.io>
2023-04-09 08:48:28 -04:00
Giteabot
695738fb31
Show protected branch rule names again ( #23907 ) ( #24018 )
...
Backport #23907 by @HesterG
`!important`s for one of the primary label selectors are removed by
#23774 , so the repository branch protection settings ui will not have
the demanding css. This PR modifies `.ui.primary.label` to fix it.
Before:
<img width="1408" alt="飞书20230404-115410"
src="https://user-images.githubusercontent.com/17645053/229683221-ef9c7d5c-68a8-42b0-ba19-ef2d5dfce5f9.png ">
After:
<img width="1419" alt="截屏2023-04-04 11 56 32"
src="https://user-images.githubusercontent.com/17645053/229683469-70cfc92d-d7ef-4323-a7f5-2247810fabce.png ">
Co-authored-by: Hester Gong <hestergong@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-09 14:06:16 +02:00
Giteabot
cfde557e23
fix: do not escape space between PyPI repository url and package name… ( #23981 ) ( #24008 )
...
Backport #23981 by @Gunzinger
…; add trailing slash to PyPI repository URL (in accordance to PEP-503)
This should solve Issue #23980 , by moving the space in front of the
package name and the package name out of the `gitea-origin-url` block.
It also adds a trailing slash to the PyPI repository URL in accordance
to [Python PEP-503](https://peps.python.org/pep-0503/ ).
Co-authored-by: Daniel Gunzinger <daniel.gunzinger@gmail.com>
2023-04-08 23:13:43 +02:00
Giteabot
3dbc63777f
Adjust sticky pr header to cover background ( #23956 ) ( #23999 )
...
Backport #23956 by @silverwind
Very minor CSS tweak: Adjust sticky PR header to cover the box-shadow of
selected files.
Before:
<img width="1250" alt="Screenshot 2023-04-06 at 22 54 59"
src="https://user-images.githubusercontent.com/115237/230492218-4d71da48-a362-4c52-a7f7-01daf4ffa458.png ">
After:
<img width="1255" alt="Screenshot 2023-04-06 at 22 54 46"
src="https://user-images.githubusercontent.com/115237/230492227-c7142210-e535-4da8-b610-37d33dcbb549.png ">
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-08 18:36:11 +02:00
Giteabot
4aabd8e823
Set ref to fully-formed of the tag when trigger event is release ( #23944 ) ( #23989 )
...
Backport #23944 by @sillyguodong
Fix #23943
When trigger event is `release`, ref should be like
`refs/tags/<tag_name>` instead of `CommitID`
Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
2023-04-08 20:43:46 +08:00
Giteabot
6a5b8eb7b6
Fix redirect bug when creating issue from a project ( #23971 ) ( #23997 )
...
Backport #23971 by @lunny
Fix #23966
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-08 12:38:56 +02:00
Giteabot
a00e473341
Remove Repository.getFilesChanged to fix Actions paths and paths-ignore filter ( #23920 ) ( #23969 )
...
Backport #23920 by @ChristopherHX
Remove the misbehaving function and call
Repository.GetFilesChangedBetween instead.
Fixes #23919
---
~~_TODO_ test this~~ `Repository.getFilesChanged` seems to be only used
by Gitea Actions, but a similar function already exists
**Update** I tested this change and the issue is gone.
Co-authored-by: ChristopherHX <christopher.homberger@web.de>
2023-04-08 16:16:21 +08:00
Giteabot
4019a6d4b2
Discolor pull request tab labels ( #23950 ) ( #23987 )
...
Backport #23950 by @silverwind
https://github.com/go-gitea/gitea/pull/22687 has discolored the repo tab
labels. This does the same for PR tabs for consistency. Value `0` is
still rendered like before.
Before:
<img width="502" alt="Screenshot 2023-04-06 at 19 35 24"
src="https://user-images.githubusercontent.com/115237/230454329-db6244ff-7d7e-4a2f-9240-f618a1c57f8c.png ">
After:
<img width="497" alt="Screenshot 2023-04-06 at 19 35 07"
src="https://user-images.githubusercontent.com/115237/230454321-a0be6551-8c31-45e4-a1fb-ffc0d85d87bf.png ">
<img width="497" alt="Screenshot 2023-04-06 at 19 38 37"
src="https://user-images.githubusercontent.com/115237/230454570-2fe2aa67-dfa7-4b2e-8c04-8dd40e6e99fc.png ">
Co-authored-by: silverwind <me@silverwind.io>
2023-04-07 22:32:42 -04:00
Jason Song
0487e39f82
Treat PRs with agit flow as fork PRs when triggering actions. ( #23884 ) ( #23967 )
...
Backport #23884 .
There is no fork concept in agit flow, anyone with read permission can
push `refs/for/<target-branch>/<topic-branch>` to the repo. So we should
treat it as a fork pull request because it may be from an untrusted
user.
2023-04-07 17:43:12 -04:00
Giteabot
3a7cb1a83b
Use Get/Set instead of Rename when Regenerate session id ( #23975 ) ( #23983 )
...
Backport #23975 by @wxiaoguang
Do not use Rename here, because the old sid and new sid may be in
different redis cluster slot.
Fix #23869
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-07 14:21:20 -05:00
Giteabot
f317186aa6
Do not crash when parsing an invalid workflow file ( #23972 ) ( #23976 )
...
Backport #23972 by @wolfogre
Fix #23658 .
Related to https://gitea.com/gitea/act/pulls/39
Co-authored-by: Jason Song <i@wolfogre.com>
2023-04-07 09:55:59 -04:00
Giteabot
5b7df68555
Ensure RSS icon is present on all repo tabs ( #23904 ) ( #23973 )
...
Backport #23904 by @silverwind
Previously, not all repo tabs had shown the RSS icon in the repo header
because the context data was not being set. Added this context data in a
new function.
Before:
<img width="806" alt="image"
src="https://user-images.githubusercontent.com/115237/229639615-9cc00e75-3a26-4ff4-a6f2-316c1fccc596.png ">
After:
<img width="815" alt="Screenshot 2023-04-04 at 00 16 17"
src="https://user-images.githubusercontent.com/115237/229639201-2e1c015b-1f13-46d4-aa14-e7a82fab3982.png ">
Co-authored-by: silverwind <me@silverwind.io>
2023-04-07 14:55:30 +02:00
Giteabot
833a4b1775
Hardcode path to docker images ( #23955 ) ( #23968 )
...
Backport #23955 by @techknowlogick
Fix #23954
This allows for building on platforms that don't have docker hub as the
default container registry.
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2023-04-07 14:54:28 +02:00
Giteabot
1b8ecd179b
Title can be empty when creating tag only ( #23917 ) ( #23961 )
...
Backport #23917 by @Zettat123
Fixes #23809
Make the title not required. If the title is empty when creating release
(not tag), an error message will be displayed.
Co-authored-by: Zettat123 <zettat123@gmail.com>
2023-04-07 20:13:57 +08:00
6543
085b56302c
Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... ( #23874 ) ( #23878 )
...
Backport #23874
2023-04-07 18:10:17 +08:00
Lunny Xiao
5066b208de
Merge push to create, open PR from push, and push options docs articles into one ( #23744 ) ( #23959 )
...
backport #23744
2023-04-07 15:49:26 +08:00
wxiaoguang
ac658bb92c
Backport locales to 1.19 ( #23960 )
...
This time the backport is done by `backport-locales.go` automatically,
no manual fix.
However, there are some new broken translations in 1.20 (main branch),
so we must fix our ini package next time, then the broken could be
resolved fundmentally.
2023-04-07 15:29:54 +08:00
Giteabot
001d3fb820
Delete deleted release attachments immediately from storage ( #23913 ) ( #23958 )
...
Backport #23913 by @lunny
Previously, deleted release attachments were kept forever on the
external storage.
Note: It may be very slow now if there are many attachments to be
deleted on this release.
Fix #23728
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-06 18:38:34 -04:00
silverwind
8092251133
Left-align review comments ( #23937 )
...
Small extract from https://github.com/go-gitea/gitea/pull/23553 for
1.19:
Before:
<img width="1190" alt="Screenshot 2023-04-05 at 21 47 55"
src="https://user-images.githubusercontent.com/115237/230190330-3cee8904-8558-43ea-b9d3-424d807d0b73.png ">
After:
<img width="1181" alt="Screenshot 2023-04-05 at 21 47 38"
src="https://user-images.githubusercontent.com/115237/230190315-c1c3cae5-1bc3-4c2d-bd3d-c119fa01be82.png ">
2023-04-06 09:45:45 +02:00
Giteabot
55239cbab7
Fix image border-radius ( #23886 ) ( #23930 )
...
Backport #23886 by @wxiaoguang
1. Instead of polluting the `border-radius` style globally, each "img"
usage should declare their own styles.
2. There were some bugs in code, I believe the `.img` selector was done
by mistake.
After:
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-05 17:07:44 +02:00
Giteabot
df74ee0376
Scroll collapsed file into view ( #23702 ) ( #23929 )
...
Backport #23702 by @jpraet
Fixes #23701 , #23515 .
Alternate approach to #23604 using CSS scroll-margin-top, which is also
taken into account for direct links to files in a diff:
* On the PR diff, this currently shows the previous file first:
https://try.gitea.io/jpraet/test/pulls/13/files#diff-b94d08b409f9d05fb65b6cccaf7b3e4ecc7cc333
* On the commit diff, the first line of the linked file is currently
under the sticky header:
1a19e6b14e (diff-b94d08b409f9d05fb65b6cccaf7b3e4ecc7cc333)
2023-04-05 13:49:22 +03:00
Giteabot
8d88f148d7
docs: make the required backticks in email password more explicit ( #23923 ) ( #23926 )
...
Backport #23923 by @teauxfu
updated the example config to make the needed backticks around the
password more obvious
Co-authored-by: alex <alexmw777@gmail.com>
2023-04-04 15:06:54 -04:00
Giteabot
7bfab90a8f
docs: fix typo ( #23924 ) ( #23925 )
...
Backport #23924 by @teauxfu
fixes a minor typo in the email templates page
Co-authored-by: alex <alexmw777@gmail.com>
2023-04-04 18:13:09 +02:00
Lunny Xiao
1a8da2e08f
Update docs markdown file weight to make it clear ( #23909 ) ( #23921 )
...
backport #23909
2023-04-04 11:27:38 -04:00
Giteabot
7c180ff8eb
Fix code view (diff) broken layout ( #23096 ) ( #23918 )
...
Backport #23096 by @wxiaoguang
Close #22911
I think it's ready for review now, feel free to test it, welcome to help
to improve.
### Before
### After
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-04 16:02:29 +02:00
Giteabot
c34f7cdb1a
Use ghost user if package creator does not exist ( #23822 ) ( #23915 )
...
Backport #23822 by @KN4CK3R
Fixes #23818
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
2023-04-04 20:37:28 +08:00
Giteabot
fd0baf637d
Org pages style fixes ( #23901 ) ( #23914 )
...
Backport #23901 by @silverwind
Few fixes/enhancements around org pages:
Use flexbox for member and repo lists and tweak rendering of tabs and
list:
<img width="765" alt="Screenshot 2023-04-03 at 22 54 24"
src="https://user-images.githubusercontent.com/115237/229625716-92a834c3-9121-4729-8b9b-3a3973cf9a91.png ">
<img width="771" alt="Screenshot 2023-04-03 at 22 55 15"
src="https://user-images.githubusercontent.com/115237/229625719-acc08ce8-4489-44a6-a9b9-e36755c55b1d.png ">
Vertically center remove/leave buttons, add link to avatar:
<img width="1223" alt="Screenshot 2023-04-03 at 21 51 20"
src="https://user-images.githubusercontent.com/115237/229612616-b662b795-e754-41a1-a77a-381c267e6104.png ">
Co-authored-by: silverwind <me@silverwind.io>
2023-04-04 19:05:41 +08:00
Giteabot
dff3ce089d
User/Org Feed render description as per web ( #23887 ) ( #23906 )
...
Backport #23887 by @6543
User descriptions should be rendered so that links and other markup
appear correct in RSS feeds.
test will be added by #23874
Co-authored-by: 6543 <6543@obermui.de>
2023-04-04 00:44:50 -04:00
Giteabot
9836b7db7b
Use User.ID instead of User.Name in ActivityPub API for Person IRI ( #23823 ) ( #23905 )
...
Backport #23823 by @wxiaoguang
Thanks to @trwnh
Close #23802
The ActivityPub id is an HTTPS URI that should remain constant, even if
the user changes their name.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-03 22:41:57 -05:00
