Commit Graph

2398 Commits

Author SHA1 Message Date
Sebastian Sdorra
8ee8c8b351 Merge branch 'develop' into feature/hg_hooks_over_tcp
# Conflicts:
#	CHANGELOG.md
2020-11-27 08:57:09 +01:00
René Pfeuffer
9d25a93558 Distinct between active and stale branches 2020-11-26 08:31:14 +01:00
René Pfeuffer
541933a03a Show last commit of branch in ui 2020-11-26 08:31:14 +01:00
René Pfeuffer
f3d25e0440 Merge pull request #1442 from scm-manager/feature/improve_plugin_update_logging
Improve logging for plugin update installation
2020-11-24 18:52:15 +01:00
René Pfeuffer
fc9176ec5a No exception for missing file on cancelled installation 2020-11-24 18:31:18 +01:00
René Pfeuffer
b67a0cb89d Improve logging for failures during plugin installation 2020-11-24 18:31:18 +01:00
René Pfeuffer
2645b0b066 Name not matching condition in exception 2020-11-24 13:59:58 +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
Eduard Heimbuch
0b96e7d08b Merge branch 'develop' into feature/hg_hooks_over_tcp 2020-11-19 14:31:00 +01:00
Sebastian Sdorra
1311061c82 Pass transaction id from request to mercurial hooks 2020-11-19 14:30:39 +01:00
René Pfeuffer
69a3a8a2da Convert update dto classes to interfaces 2020-11-19 13:19:49 +01:00
Sebastian Sdorra
29faa5ec6c Fix review findings 2020-11-19 12:22:52 +01:00
René Pfeuffer
bab4a56e22 Make dtos for schema docs unusable 2020-11-19 07:48:21 +01:00
Florian Scholdei
ec87ccca9d Minor corrections to resources and dtos 2020-11-18 17:12:04 +01:00
Florian Scholdei
9f0a93978c Add examples to core resources and create DTO adapted to schemata 2020-11-18 17:12:04 +01:00
Sebastian Sdorra
58a0c515b0 Merge with develop branch 2020-11-18 10:07:28 +01:00
René Pfeuffer
6d2eab1342 Merge pull request #1430 from scm-manager/feature/ignore_codes_on_tracing
Enhance trace api with accepted status codes
2020-11-17 17:50:52 +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
3f5bfd1d03 Merge pull request #1423 from scm-manager/feature/improve_group_resources
Feature/improve group resources
2020-11-17 10:40:29 +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
René Pfeuffer
b2533db684 Simplify mapper 2020-11-12 11:41:04 +01:00
Eduard Heimbuch
77788bab01 cleanup 2020-11-11 16:42:09 +01:00
Florian Scholdei
82017c7d65 Create DTO adapted to schema 2020-11-11 15:00:18 +01:00
Eduard Heimbuch
bb82c18e2b add delete link to branchDto 2020-11-11 14:09:15 +01:00
Florian Scholdei
59eb9de80b Add examples for group resources 2020-11-10 17:23:12 +01:00
Eduard Heimbuch
2fab771740 create endpoint for branch deletion 2020-11-10 15:41:13 +01:00
Sebastian Sdorra
36aa05986f Disable shiro session storage
We use JWT for session management, so we can disable shiro session management and this allows usage of SecurityManager outside of a http request.
2020-11-10 10:03:53 +01:00
Sebastian Sdorra
d86b2f70c3 Disable xsrf for mercurial hook tokens 2020-11-10 10:03:53 +01:00
Sebastian Sdorra
d518af4ccc Refactor nearly the whole scm-hg-plugin for new hook implementation 2020-11-10 10:03:53 +01:00
Eduard Heimbuch
121c0d1bf2 fix race condition on authorization event processing which leads to permission mismatch 2020-11-09 16:07:09 +01:00
Konstantin Schaper
4144e29599 fix scope check 2020-11-05 11:27:11 +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
Florian Scholdei
f3d8babc67 Merge with upstream 2020-11-03 11:44:13 +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
Florian Scholdei
c87fa5b3e5 Revert "Exclude null case if groupManager is not set"
This reverts commit 81dc317f
2020-11-03 08:58:06 +01:00
Konstantin Schaper
56331c4201 use api key scope when creating access tokens from api keys instead of full user scope 2020-11-02 17:13:13 +01:00
Konstantin Schaper
578e028d5b Merge branch 'develop' into bugfix/rest-download 2020-11-02 13:28:44 +01:00
Konstantin Schaper
22e0944377 fix review findings 2020-11-02 13:27:18 +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