Commit Graph

11004 Commits

Author SHA1 Message Date
snyk-bot
e3cbdf6a93 fix: pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-JUNIT-1017047
2020-10-13 21:57:02 +00:00
Sebastian Sdorra
a680b75f85 Add missing helm chart information 2020-10-13 08:40:20 +02:00
Sebastian Sdorra
4f99d4c60e Merge pull request #1366 from scm-manager/bugfix/fix_git_hook_tag_provider_unit_test
Remove unnecessary null check
2020-10-13 07:34:48 +02:00
René Pfeuffer
c5f8d975a3 Remove unnecessary null check
The function RevWalk#parseAny indeed never returns null. This check only
was there to satisfy the (therefore wrong) unit test.
2020-10-12 19:02:28 +02:00
CES Marvin
befd50eeef prepare for next development iteration 2020-10-12 13:26:08 +00:00
Jenkins Agent User
a3c33af20a Merge branch 'master' into develop 2020-10-12 13:25:31 +00:00
CES Marvin
abe8413802 release version 2.7.0 2.7.0 2020-10-12 12:41:15 +00:00
Eduard Heimbuch
3d8dc0ed05 Revert "Fix sonar issue"
This reverts commit 0b0df4ed
2020-10-12 14:24:11 +02:00
Eduard Heimbuch
eb3525a680 improve translations 2020-10-12 13:02:26 +02:00
Eduard Heimbuch
181411f52b Adjust changelog for release 2.7.0 2020-10-12 12:45:27 +02:00
René Pfeuffer
0d180b1d5e Merge branch 'master' into develop 2020-10-12 12:01:16 +02:00
CES Marvin
649028fc41 release version 2.6.2 2.6.2 2020-10-12 11:55:57 +02:00
René Pfeuffer
0b0df4ed5f Fix sonar issue 2020-10-12 08:28:39 +02:00
René Pfeuffer
4f8ff460c2 Merge pull request #1363 from scm-manager/snyk-upgrade-75b57c0ace492c3aad904cea13090684
[Snyk] Upgrade org.mockito:mockito-core from 3.5.10 to 3.5.11
2020-10-12 07:49:24 +02:00
René Pfeuffer
7756fe147d Merge pull request #1364 from scm-manager/snyk-upgrade-c5f490d6ef74c9e6980e2f76b1baceae
[Snyk] Upgrade org.jboss.resteasy:resteasy-jackson2-provider from 4.5.6.Final to 4.5.7.Final
2020-10-12 07:26:01 +02:00
snyk-bot
6f879a6fed fix: upgrade org.jboss.resteasy:resteasy-jackson2-provider from 4.5.6.Final to 4.5.7.Final
Snyk has created this PR to upgrade org.jboss.resteasy:resteasy-jackson2-provider from 4.5.6.Final to 4.5.7.Final.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-jackson2-provider/

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-10-11 21:57:14 +00:00
snyk-bot
5fa6320006 fix: upgrade org.mockito:mockito-core from 3.5.10 to 3.5.11
Snyk has created this PR to upgrade org.mockito:mockito-core from 3.5.10 to 3.5.11.

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-10-09 21:57:56 +00:00
René Pfeuffer
d9d7558fa2 Merge branch 'release/2.6.2' into develop 2020-10-09 13:55:55 +02:00
eheimbuch
78102373d0 Update release-process.md 2020-10-09 13:10:53 +02:00
Florian Scholdei
34946e7466 Merge branch 'develop' of ssh://github.com/scm-manager/scm-manager into develop 2020-10-09 12:40:44 +02:00
Florian Scholdei
db6ec1e543 Update documentation 2020-10-09 12:40:18 +02:00
René Pfeuffer
2f5b6d98c6 Merge branch 'support/2.6.x' into develop 2020-10-09 12:16:23 +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
Eduard Heimbuch
5c3e489fa7 Correct CHANGELOG 2020-10-08 10:26:16 +02:00
René Pfeuffer
22de79cfa1 Correct CHANGELOG
API keys are _not_ part of 2.6.1
2020-10-08 09:32:42 +02:00
René Pfeuffer
18412d67a3 Merge branch 'bugfix/git_browse_recursive' into develop 2020-10-08 09:30:25 +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
eheimbuch
eed7ec74a0 Merge pull request #1357 from scm-manager/feature/subrepository_link
Add subrepository support
2020-10-08 09:24:40 +02:00
Eduard Heimbuch
5cbe3298e4 rm obsolete check 2020-10-08 09:23:12 +02:00
Florian Scholdei
9d9531be95 Merge with upstream 2020-10-08 00:47:45 +02:00
Florian Scholdei
622a9a0427 Add multiple svn externals support 2020-10-08 00:43:17 +02:00
Florian Scholdei
a2f1c88bfd Add explanatory text in logic part, rename some variables 2020-10-07 20:33:09 +02:00
Konstantin Schaper
0f25508353 Merge pull request #1349 from scm-manager/feature/modal-rework
Feature/modal rework
2020-10-07 18:22:19 +02:00
Eduard Heimbuch
9271da85a5 fix svn browse command external directory 2020-10-07 17:37:59 +02:00
Florian Scholdei
90580e902d Fix review finding 2020-10-07 16:39:26 +02:00
Sebastian Sdorra
6b261fa7cb Add mock for useTranslation to i18n of ui-tests 2020-10-07 15:38:45 +02:00
Florian Scholdei
10549ae214 Fix detection for externals in SVN 2020-10-07 10:04:54 +02:00
eheimbuch
6eaae7b908 Merge pull request #1359 from scm-manager/feature/api_keys
API keys
2020-10-07 08:43:45 +02:00
René Pfeuffer
82c7b86605 Use trash bin in table, again 2020-10-06 16:39:19 +02:00
René Pfeuffer
d03763671b Mind review remarks 2020-10-06 15:42:26 +02:00
Konstantin Schaper
330e974cac fix review findings 2020-10-06 13:45:17 +02:00
Florian Scholdei
6baf759df9 Move FileLink.test.ts 2020-10-06 10:27:50 +02:00
eheimbuch
ded866e033 Merge pull request #1360 from scm-manager/snyk-upgrade-e951f1ff22af30e1ab6b800f1ecc881c
[Snyk] Upgrade org.junit.jupiter:junit-jupiter-api from 5.6.2 to 5.7.0
2020-10-06 10:18:12 +02:00
snyk-bot
27f81854a1 fix: upgrade org.junit.jupiter:junit-jupiter-api from 5.6.2 to 5.7.0
Snyk has created this PR to upgrade org.junit.jupiter:junit-jupiter-api from 5.6.2 to 5.7.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api/

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-10-06 01:00:12 +00:00
Konstantin Schaper
fcbdb6c2f7 fix dialogs not closing properly 2020-10-05 20:05:57 +02:00