Commit Graph

11326 Commits

Author SHA1 Message Date
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
René Pfeuffer
ff92d8d2bc Revert "fix: scm-ui/ui-components/package.json to reduce vulnerabilities"
This reverts commit f90b606a01.
2020-11-17 09:58:23 +01:00
Eduard Heimbuch
46c03aa502 Merge pull request #1412 from scm-manager/snyk-fix-bcd8a1a99ee8ad08ff8b58b0de380d10
[Snyk] Security upgrade react-markdown from 4.3.1 to 5.0.0
2020-11-17 09:06:29 +01:00
Eduard Heimbuch
a0e7073bdf Merge pull request #1417 from scm-manager/bugfix/close_hg_diff_stream
Fix missing close of hg diff command
2020-11-16 11:15:57 +01:00
Eduard Heimbuch
fe0e28a740 Merge pull request #1422 from scm-manager/feature/delete_branches
Feature/delete branches
2020-11-12 17:05:20 +01:00
Eduard Heimbuch
831aa09cff Merge branch 'develop' into feature/delete_branches 2020-11-12 14:58:51 +01:00
Eduard Heimbuch
358b2ed993 only instantiate confirmAlert if needed 2020-11-12 14:56:45 +01:00
Eduard Heimbuch
85d485df50 Merge pull request #1420 from scm-manager/feature/show_scm_messages_in_errors
Show scm messages in errors
2020-11-12 14:47:53 +01:00
René Pfeuffer
08a2cca06d Heed review comments 2020-11-12 13:55:01 +01:00
René Pfeuffer
f8219305a3 Strip 'Error:' from hg error messages 2020-11-12 13:52:37 +01:00
René Pfeuffer
a479fcbfe1 Log change 2020-11-12 11:41:46 +01:00
René Pfeuffer
8cfbc60fea Distinguish between errors with and without details 2020-11-12 11:41:04 +01:00
René Pfeuffer
5b44be5e5b Show error message once only 2020-11-12 11:41:04 +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
René Pfeuffer
8d797a454a Fix typings 2020-11-12 11:41:04 +01:00
René Pfeuffer
650e451501 Merge pull request #1415 from scm-manager/feature/lookup_api
Feature/lookup api
2020-11-12 09:42:23 +01:00
René Pfeuffer
6abf793f49 Fix formatting 2020-11-12 08:11:40 +01:00
René Pfeuffer
8e10f7e7ed Fix generics as far as possible 2020-11-12 08:10:01 +01:00
CES Marvin
59e28ec313 prepare for next development iteration 2020-11-11 17:48:56 +00:00
Jenkins Agent User
50be9f2e50 Merge branch 'master' into develop 2020-11-11 17:48:20 +00:00
CES Marvin
bc4c2df27c release version 2.9.1 2.9.1 2020-11-11 17:15:36 +00:00
René Pfeuffer
444a9e8746 Merge branch 'bugfix/german_repo_translation' into develop 2020-11-11 17:40:09 +01:00
Eduard Heimbuch
595d97b211 cleanup 2020-11-11 17:20:13 +01:00
Eduard Heimbuch
f93c9f3e7c update documentation 2020-11-11 17:10:37 +01:00
René Pfeuffer
8781a94073 Fix german translation file for repositories 2020-11-11 17:08:35 +01:00
Eduard Heimbuch
77788bab01 cleanup 2020-11-11 16:42:09 +01:00
Eduard Heimbuch
82c43a2012 update CHANGELOG.md 2020-11-11 16:07:27 +01:00
Eduard Heimbuch
20d2f6b5d5 add 'delete branch' function to frontend 2020-11-11 15:58:58 +01:00
eheimbuch
a5017f7206 Merge pull request #1421 from scm-manager/bugfix/heed_git_quiet_flag
Adhere to qit quiet flag
2020-11-11 15:01:02 +01:00
Florian Scholdei
82017c7d65 Create DTO adapted to schema 2020-11-11 15:00:18 +01:00
René Pfeuffer
fcd6003a4f Adhere to qit quiet flag 2020-11-11 14:46:53 +01:00
Eduard Heimbuch
bb82c18e2b add delete link to branchDto 2020-11-11 14:09:15 +01:00
René Pfeuffer
923526bafa Merge remote-tracking branch 'origin/develop' into feature/lookup_api 2020-11-11 13:55:37 +01:00
René Pfeuffer
8b4af7a817 Merge pull request #1418 from scm-manager/snyk-upgrade-e95f85b11e8fedb7dad1998fd7c90cbe
[Snyk] Upgrade org.mockito:mockito-core from 3.5.13 to 3.5.15
2020-11-11 10:14:41 +01:00
snyk-bot
10ebae4822 fix: upgrade org.mockito:mockito-core from 3.5.13 to 3.5.15
Snyk has created this PR to upgrade org.mockito:mockito-core from 3.5.13 to 3.5.15.

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/c575ed09-e310-44e7-afc8-22b77c5873cf?utm_source=github&utm_medium=upgrade-pr
2020-11-10 21:57:28 +00: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
6c8c30b929 Fix missing close of hg diff command 2020-11-10 11:09:23 +01:00
Eduard Heimbuch
c6d3a8054e fix code smell 2020-11-10 10:58:53 +01:00
Eduard Heimbuch
4ed3a0aef6 update CHANGELOG.md 2020-11-10 10:15:43 +01:00
Eduard Heimbuch
1709fa0e3d update java doc since version 2020-11-10 10:14:13 +01:00
Eduard Heimbuch
a97774f729 Merge branch 'develop' into feature/lookup_api 2020-11-10 08:39:48 +01:00
René Pfeuffer
a6ec38ec27 Merge pull request #1414 from scm-manager/bugfix/authorization_events_race_condition
Permission race condition on repository initialization
2020-11-09 17:40:24 +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
CES Marvin
9930d82d32 prepare for next development iteration 2020-11-06 08:40:11 +00:00
CES Marvin
ea6e24c212 release version 2.9.0 2.9.0 2020-11-06 08:05:48 +00:00
Eduard Heimbuch
47aae200f3 Adjust changelog for release 2.9.0 2020-11-06 08:59:49 +01:00
snyk-bot
f90b606a01 fix: scm-ui/ui-components/package.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-TRIM-1017038
2020-11-05 22:41:24 +00:00
Sebastian Sdorra
98166e27a1 Merge pull request #1407 from scm-manager/bugfix/api-key-to-access-token
Bugfix/api key to access token
2020-11-05 12:53:25 +01:00