Commit Graph

1263 Commits

Author SHA1 Message Date
Konstantin Schaper
e8044747e3 fix review findings 2020-12-01 11:18:19 +01:00
Konstantin Schaper
e18480ad2b add permission check to hal links for tags 2020-11-30 15:25:29 +01:00
Konstantin Schaper
8986e3d378 Merge branch 'develop' into feature/manage-tags
# Conflicts:
#	scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
2020-11-30 14:18:05 +01:00
Konstantin Schaper
7e46c3a491 wip fixes 2020-11-30 14:15:42 +01:00
Sebastian Sdorra
8ee8c8b351 Merge branch 'develop' into feature/hg_hooks_over_tcp
# Conflicts:
#	CHANGELOG.md
2020-11-27 08:57:09 +01:00
Konstantin Schaper
84ea159741 add unit test for rest endpoints 2020-11-25 12:08:51 +01:00
Konstantin Schaper
d0feb7c22c implement hg tag command and add rest endpoints 2020-11-25 11:29:06 +01:00
René Pfeuffer
8e7d0d87af Validate 'plugins.json' files from core 2020-11-25 10:31:42 +01:00
René Pfeuffer
fc9176ec5a No exception for missing file on cancelled installation 2020-11-24 18:31:18 +01:00
Sebastian Sdorra
0841a0a409 Merge branch 'feature/hg_hooks_over_tcp' of github.com:scm-manager/scm-manager into feature/hg_hooks_over_tcp 2020-11-19 14:34:56 +01:00
Sebastian Sdorra
1311061c82 Pass transaction id from request to mercurial hooks 2020-11-19 14:30:39 +01:00
Sebastian Sdorra
29faa5ec6c Fix review findings 2020-11-19 12:22:52 +01:00
Eduard Heimbuch
3132dbc0f8 remove obsolete tests 2020-11-19 09:50:35 +01:00
Eduard Heimbuch
4411e24ea7 add test 2020-11-17 12:57:49 +01:00
Eduard Heimbuch
65884a9168 Enhance trace api to set codes which are accepted as successful. This way requests can be traced as successful even if the response code is 4xx or 5xx. 2020-11-17 12:51:11 +01:00
Eduard Heimbuch
831aa09cff Merge branch 'develop' into feature/delete_branches 2020-11-12 14:58:51 +01:00
René Pfeuffer
01a5dbd091 Show messages from native scm protocol 2020-11-12 11:41:04 +01:00
Eduard Heimbuch
bb82c18e2b add delete link to branchDto 2020-11-11 14:09:15 +01:00
Eduard Heimbuch
2fab771740 create endpoint for branch deletion 2020-11-10 15:41:13 +01:00
Konstantin Schaper
7b24a4e95c Merge branch 'develop' into bugfix/api-key-to-access-token 2020-11-05 10:14:52 +01:00
Sebastian Sdorra
423402e62b Add option to disable request tracing 2020-11-04 09:44:08 +01:00
Konstantin Schaper
3dd0272c4a Merge branch 'bugfix/api-key-to-access-token' of github.com:scm-manager/scm-manager into bugfix/api-key-to-access-token 2020-11-04 09:38:46 +01:00
Konstantin Schaper
b5f042ad15 use preexisiting scope by default but prevent overriding of builder scope and update unit tests 2020-11-04 09:38:29 +01:00
Sebastian Sdorra
5694a89589 Set span kinds for internal requests 2020-11-04 09:37:24 +01:00
Sebastian Sdorra
b91d9e6b60 Add exception class to failed span of AdvancedHttpClient 2020-11-04 08:55:23 +01:00
Sebastian Sdorra
3c32073853 Merge with develop 2020-11-04 08:22:41 +01:00
Konstantin Schaper
616e1efc97 Merge branch 'develop' into bugfix/api-key-to-access-token 2020-11-03 14:48:39 +01:00
Konstantin Schaper
621ed5b827 update unit test name 2020-11-03 14:43:06 +01:00
Florian Scholdei
f3d8babc67 Merge with upstream 2020-11-03 11:44:13 +01:00
Konstantin Schaper
5c42c3b49d update unit test 2020-11-03 11:42:44 +01:00
Florian Scholdei
bfa917859a Make authenticatedGroup external, fix small flaw 2020-11-03 10:57:46 +01:00
Florian Scholdei
f1115099c9 Create unit tests, supplement missing groupManager precondition, add createAuthenticatedGroup factory 2020-11-03 10:45:47 +01:00
René Pfeuffer
4b15468e67 Merge remote-tracking branch 'origin/develop' into bugfix/rest-download 2020-11-03 10:23:00 +01:00
Sebastian Sdorra
9fe065f796 Merge pull request #1399 from scm-manager/feature/default_branch
Make default branch for git configurable
2020-11-03 08:23:03 +01:00
Konstantin Schaper
578e028d5b Merge branch 'develop' into bugfix/rest-download 2020-11-02 13:28:44 +01:00
Sebastian Sdorra
b6b0736cd9 Make JwtAccessTokenBuilderTest more robust 2020-11-02 10:41:21 +01:00
René Pfeuffer
c2a7ed8869 Validate banch names 2020-10-30 14:24:31 +01:00
Konstantin Schaper
0beb749f23 adjust scm client check and update unit test accordingly 2020-10-30 12:20:45 +01:00
Eduard Heimbuch
23cc02ec99 Merge branch 'develop' into feature/user_converter 2020-10-28 08:42:26 +01:00
Eduard Heimbuch
8f52fc50f1 Merge branch 'develop' into feature/trace_api 2020-10-27 15:00:10 +01:00
Sebastian Sdorra
76dee09e3c Mark span as failed if an IOException occurs 2020-10-27 08:15:10 +01:00
Sebastian Sdorra
eb7a7837d7 Integrate trace api with AdvancedHttpClient 2020-10-26 16:54:05 +01:00
Sebastian Sdorra
09d85f6dbb Implemented default LoggingExporter for trace api 2020-10-26 16:51:57 +01:00
René Pfeuffer
1ca18cd44c Do not create web tokens for api keys
This fixes a way for privilege escalation with api keys.
2020-10-26 10:19:59 +01:00
eheimbuch
b8c419792e Merge branch 'develop' into feature/user_converter 2020-10-23 12:08:23 +02:00
Eduard Heimbuch
e8b07aaae1 fix translations 2020-10-23 08:54:56 +02:00
René Pfeuffer
d2d237e0c2 Merge pull request #1385 from scm-manager/bugfix/logging_error_reading_api_token
Reduce logging of ApiTokenRealm
2020-10-23 08:15:22 +02:00
Sebastian Sdorra
1195026fe6 Fix handling of snapshot plugin dependencies 2020-10-22 15:06:39 +02:00
Sebastian Sdorra
7b91cf82bf Reduce logging of ApiTokenRealm 2020-10-22 14:39:09 +02:00
Eduard Heimbuch
f73f60aabc Merge branch 'feature/user_converter' of github.com:scm-manager/scm-manager into feature/user_converter 2020-10-22 13:17:07 +02:00