Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-18 05:22:10 +01:00
Code Issues Packages Projects Releases Activity
10,894 Commits 38 Branches 210 Tags
a39abcdbe99c81fcb80e2edb048b827aa185d4ac
Commit Graph

10894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
René Pfeuffer
f594674ad0 Merge pull request #1341 from scm-manager/snyk-upgrade-b3e57a904463f34f171b6aaebdde0946 
[Snyk] Upgrade org.assertj:assertj-core from 3.17.0 to 3.17.1
 2020-09-22 08:52:55 +02:00
snyk-bot
1fd0d6baf6 fix: upgrade org.assertj:assertj-core from 3.17.0 to 3.17.1 
Snyk has created this PR to upgrade org.assertj:assertj-core from 3.17.0 to 3.17.1.

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-22 01:00:06 +00:00
Eduard Heimbuch
c784c97acf create release version checker 2020-09-21 17:04:30 +02:00
Eduard Heimbuch
404e6fec66 add rss release feed url to global config 2020-09-21 15:26:51 +02:00
eheimbuch
bd340e9c36 Merge pull request #1340 from scm-manager/bugfix/load_sources_with_offset 
Handling of branch with slashes in source view
 2020-09-21 14:56:58 +02:00
Eduard Heimbuch
bef11e9f70 fix unit test 2020-09-21 14:18:11 +02:00
Eduard Heimbuch
1cad9c3fbc Merge branch 'develop' into feature/rebase 2020-09-21 14:01:34 +02:00
eheimbuch
36fd5fb598 Merge pull request #1339 from scm-manager/bugfix/branchselector_overflow 
Overflow for too long branch names
 2020-09-21 12:20:22 +02:00
eheimbuch
0b85794d84 Merge branch 'develop' into bugfix/branchselector_overflow 2020-09-21 12:20:11 +02:00
Florian Scholdei
7159f4766c Merge with upstream 2020-09-21 12:16:35 +02:00
Florian Scholdei
a268eee3a4 Update CHANGELOG.md 2020-09-21 12:14:17 +02:00
eheimbuch
a8d1bf0d60 Merge pull request #1338 from scm-manager/bugfix/branchselector_default_entry 
Set default branch in branch selector if nothing is selected
 2020-09-21 12:12:45 +02:00
Florian Scholdei
9f0ff33f46 Fix handling of slashes in branches in 'offset loading'-case 2020-09-21 12:05:07 +02:00
Florian Scholdei
1f0055e732 Update CHANGELOG.md 2020-09-21 11:14:36 +02:00
Florian Scholdei
e5be70e869 Merge remote-tracking branch 'origin/develop' into bugfix/branchselector_overflow 2020-09-21 11:06:31 +02:00
Florian Scholdei
2de30a2224 Use array find instead of filter 2020-09-21 11:01:22 +02:00
Florian Scholdei
b7d3a17ee5 Merge with upstream 2020-09-21 10:50:52 +02:00
eheimbuch
5af60a7b81 Merge pull request #1335 from scm-manager/feature/namespace_permissions 
Feature/namespace permissions
 2020-09-21 10:44:43 +02:00
Eduard Heimbuch
bb4874b8c1 user with write permission on namespacesPermissions may also read the namespacePermissions so it is consistent to other permissions 2020-09-21 10:44:12 +02:00
Florian Scholdei
8123fbb164 Correct overflow for too long branch names 2020-09-21 10:37:03 +02:00
Florian Scholdei
97a8211c75 Update CHANGELOG.md 2020-09-21 10:08:22 +02:00
Florian Scholdei
a1ea6ea62e Set default branch in branch selector if nothing is selected 2020-09-21 09:58:49 +02:00