CES Marvin
649028fc41
release version 2.6.2
2020-10-12 11:55:57 +02:00
René Pfeuffer
8286f3c94a
Adjust changelog for release 2.6.2
2020-10-09 12:09:46 +02:00
René Pfeuffer
f7a4061ae4
Merge remote-tracking branch 'origin/support/2.6.x' into support/2.6.x
2020-10-09 08:05:16 +02:00
Sebastian Sdorra
7dae40db70
Merge pull request #1362 from scm-manager/bugfix/anonymous-cas-external-logout_261
...
Introduce api for handling token validation failed exception
2020-10-09 07:59:16 +02:00
René Pfeuffer
11430200bf
Log change
2020-10-09 07:47:06 +02:00
Konstantin Schaper
f2a53644b6
introduce api for handling token validation failed exception
2020-10-09 07:20:08 +02:00
René Pfeuffer
805f0894fb
Fix sonar finding
2020-10-08 09:24:59 +02:00
René Pfeuffer
e8506ff14d
Fix recursive iteration
...
Due to the api of TreeWalk we have no real change to iterate this
recursively, so we get back to good old loops.
2020-10-08 09:24:56 +02:00
CES Marvin
5887c5c268
release version 2.6.1
2020-09-30 07:32:54 +00:00
Eduard Heimbuch
e0058fb400
Adjust changelog for release 2.6.1
2020-09-30 09:26:12 +02:00
eheimbuch
46e4bc2196
Merge pull request #1355 from scm-manager/bugfix/fix_not_found_on_empty_hg_repo
...
Fix not found error when reading empty hg repository
2020-09-30 09:22:02 +02:00
René Pfeuffer
a6af1d0e34
Fix not found error when reading empty hg repository
2020-09-29 10:43:41 +02:00
Florian Scholdei
4762a491ad
Small typo
2020-09-29 08:45:14 +02:00
René Pfeuffer
53f871ac39
Merge pull request #1353 from scm-manager/snyk-upgrade-c09efccc40e067d1d02bc6c3502b8908
...
[Snyk] Upgrade org.assertj:assertj-core from 3.17.1 to 3.17.2
2020-09-28 11:18:03 +02:00
René Pfeuffer
b0ef53c97b
Merge pull request #1352 from scm-manager/snyk-upgrade-613b6f6086cf814182e7bfd16f5817f9
...
[Snyk] Upgrade org.mockito:mockito-junit-jupiter from 3.5.9 to 3.5.10
2020-09-28 10:10:35 +02:00
snyk-bot
57a08c9323
fix: upgrade org.assertj:assertj-core from 3.17.1 to 3.17.2
...
Snyk has created this PR to upgrade org.assertj:assertj-core from 3.17.1 to 3.17.2.
See this package in Maven Repository:
https://mvnrepository.com/artifact/org.assertj/assertj-core/
See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
2020-09-28 01:00:07 +00:00
snyk-bot
038e05f5e0
fix: upgrade org.mockito:mockito-junit-jupiter from 3.5.9 to 3.5.10
...
Snyk has created this PR to upgrade org.mockito:mockito-junit-jupiter from 3.5.9 to 3.5.10.
See this package in Maven Repository:
https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter/
See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
2020-09-26 01:00:26 +00:00
CES Marvin
4e7d62ce2f
prepare for next development iteration
2020-09-25 10:05:04 +00:00
CES Marvin
e2f8566a8b
release version 2.6.0
2020-09-25 09:25:13 +00:00
Eduard Heimbuch
b498dba261
Adjust changelog for release 2.6.0
2020-09-25 11:15:44 +02:00
René Pfeuffer
a86d42d78c
Merge pull request #1351 from scm-manager/bugfix/only_template_default_commit_message
...
fix message templating
2020-09-25 11:04:30 +02:00
René Pfeuffer
e1ec5ef5c6
Update CHANGELOG.md
2020-09-25 11:02:37 +02:00
Eduard Heimbuch
a39abcdbe9
enhance mergeCommandBuilder API with setMessage to avoid templating commit messages
2020-09-25 10:30:45 +02:00
Eduard Heimbuch
f0db57faed
update CHANGELOG.md
2020-09-25 10:05:33 +02:00
Eduard Heimbuch
f5060f9d16
fix message templating
2020-09-25 09:46:52 +02:00
René Pfeuffer
9f8f26e055
Merge pull request #1342 from scm-manager/feature/admin_info
...
Feature/admin info
2020-09-24 12:32:24 +02:00
Eduard Heimbuch
0f7707d539
fix unit test
2020-09-24 12:25:36 +02:00
René Pfeuffer
2626bd118a
Use configured url as cache key
...
Doing so, we will ignore the cached result every time a new feed url is
specified. So a change of the url will be taken into account immediately
2020-09-24 11:57:54 +02:00
René Pfeuffer
ebd48413b8
Catch all exceptions
...
Otherwise sax exceptions will escape this catch and we cannot cache the
result which leads to requests every time the update info is requested.
2020-09-24 11:57:54 +02:00
René Pfeuffer
1bf70fd655
Offer update info link only, when feed url is specified
2020-09-24 11:57:54 +02:00
René Pfeuffer
6a80cce87a
Make request for feed more resilient
...
This commit tackles the following issue:
When the release feed takes a long time to read (however), the former
solution would propagete requests to the SCM-Manager to multiple
requests of the specified feed url. This can, in the worst case, cause
a drain of resources like request threads.
We fix this with two actions:
1. We wrap the request itself in an executor with a timeout,
2. We only trigger one request at a time, so that we will not flood
the feed server with requests.
2020-09-24 11:57:33 +02:00
Eduard Heimbuch
23581e780d
fix review findings
2020-09-24 10:59:27 +02:00
Eduard Heimbuch
b424bc8ff0
Merge branch 'develop' into feature/admin_info
2020-09-24 10:41:17 +02:00
Eduard Heimbuch
804a6498a7
fix review findings
2020-09-24 10:38:40 +02:00
Florian Scholdei
b72dc36f3e
Fix TagDetail title on mobile view
2020-09-24 09:52:54 +02:00
eheimbuch
c1c6b7ae74
Merge pull request #1344 from scm-manager/bugfix/correct_revision_for_tags_in_hooks
...
Determine correct revision for tags in hooks
2020-09-24 09:15:44 +02:00
René Pfeuffer
cd9da7e658
Determine correct revision for tags in hooks
...
The former code only resolved the object id of the tags, when those were
annotated tags (for "simple" tags the code worked fine). Now we even can
handle nested tags (tags that reference other tags).
2020-09-24 08:28:52 +02:00
René Pfeuffer
0c2eda9209
Merge pull request #1348 from scm-manager/snyk-upgrade-e61ae1e1304f211ab518ad35648c0664
...
[Snyk] Upgrade org.mockito:mockito-core from 3.5.7 to 3.5.9
2020-09-24 07:52:54 +02:00
René Pfeuffer
d2f6018059
Merge pull request #1346 from scm-manager/snyk-upgrade-efc5972949e16297f88c4a6d0516cb3e
...
[Snyk] Upgrade commons-daemon:commons-daemon from 1.2.2 to 1.2.3
2020-09-24 07:52:29 +02:00
snyk-bot
35aebd39d9
fix: upgrade org.mockito:mockito-core from 3.5.7 to 3.5.9
...
Snyk has created this PR to upgrade org.mockito:mockito-core from 3.5.7 to 3.5.9.
See this package in Maven Repository:
https://mvnrepository.com/artifact/org.mockito/mockito-core/
See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
2020-09-24 01:00:08 +00:00
snyk-bot
f9ad64012b
fix: upgrade commons-daemon:commons-daemon from 1.2.2 to 1.2.3
...
Snyk has created this PR to upgrade commons-daemon:commons-daemon from 1.2.2 to 1.2.3.
See this package in Maven Repository:
https://mvnrepository.com/artifact/commons-daemon/commons-daemon/
See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/9ae37cfe-98a5-4b6b-bbf7-ffa5cde55e58?utm_source=github&utm_medium=upgrade-pr
2020-09-23 21:16:17 +00:00
eheimbuch
beb89633ac
Merge pull request #1343 from scm-manager/bugfix/not_existing_path_in_hg
...
Detect missing paths in hg fileview command
2020-09-23 10:10:14 +02:00
Eduard Heimbuch
ff6aaf7bc5
cleanup
2020-09-23 09:52:43 +02:00
René Pfeuffer
059482f8ab
Detect missing paths in hg fileview command
...
If a not existing path is request in the fileview command, it will
be treated as an empty directory. But such a thing does not exist in hg.
Therefore we handle this result as what it is: a not existing path -
and we throw a not found exception.
2020-09-22 17:31:57 +02:00
Eduard Heimbuch
6014eea193
update documentation
2020-09-22 16:53:08 +02:00
Eduard Heimbuch
2dc3fb4385
update CHANGELOG.md
2020-09-22 16:24:37 +02:00
Eduard Heimbuch
65caa05433
add download link for new SCM-Manager version to admin information page
2020-09-22 16:21:49 +02:00
Eduard Heimbuch
851c5f9287
create admin info resource // fix rss feed parsing
2020-09-22 13:41:40 +02:00
René Pfeuffer
fc534605f0
Merge pull request #1332 from scm-manager/feature/rebase
...
implement git rebase
2020-09-22 12:20:35 +02:00
René Pfeuffer
ab6be650e9
Simplify permissions
2020-09-22 10:08:30 +02:00
