Commit Graph

11068 Commits

Author SHA1 Message Date
Eduard Heimbuch
96233997b4 change SvnLookupCommand implementation to match the svn lookup api 2020-11-04 09:27:16 +01:00
Eduard Heimbuch
c005944a5c wrap lookup command result in java.util.Optional to clarify api 2020-10-21 10:18:29 +02:00
Eduard Heimbuch
018ebf03ba fix unit test 2020-10-20 13:14:03 +02:00
Eduard Heimbuch
020314bd00 Merge branch 'develop' into feature/lookup_api 2020-10-20 12:58:39 +02:00
eheimbuch
42c5ed1638 Merge pull request #1376 from scm-manager/feature/fullscreen
Feature/fullscreen
2020-10-20 12:31:48 +02:00
Eduard Heimbuch
8fe612cc06 create lookup command 2020-10-20 11:40:29 +02:00
Florian Scholdei
cfb0b2d6c6 Merge with upstream, add missing refs in CHANGELOG.md 2020-10-20 11:11:18 +02:00
Florian Scholdei
5889bb0365 Update storyshots 2020-10-20 10:49:56 +02:00
Eduard Heimbuch
445d26e2b7 fix storyshots 2020-10-20 10:31:56 +02:00
Florian Scholdei
27d4b0a755 Fix review findings 2020-10-20 10:18:44 +02:00
Sebastian Sdorra
ef983b4483 Merge with support/2.6.x branch 2020-10-20 07:55:29 +02:00
Sebastian Sdorra
adeca20023 Merge pull request #1377 from scm-manager/bugfix/missing_gpg_permissions
Fix missing default permission for managing public gpg keys
2020-10-20 07:45:12 +02:00
Sebastian Sdorra
d09a0b2a7c Merge pull request #1378 from scm-manager/snyk-upgrade-69095b646ff585a3714c2f29d15a4ff3
[Snyk] Upgrade org.mockito:mockito-core from 3.5.11 to 3.5.13
2020-10-17 10:04:34 +02:00
snyk-bot
5f1035986d fix: upgrade org.mockito:mockito-core from 3.5.11 to 3.5.13
Snyk has created this PR to upgrade org.mockito:mockito-core from 3.5.11 to 3.5.13.

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-16 21:57:13 +00:00
CES Marvin
597f29f466 prepare for next development iteration 2020-10-16 11:43:18 +00:00
CES Marvin
fbf3f9fd5f release version 2.6.3 2.6.3 2020-10-16 11:12:06 +00:00
Sebastian Sdorra
abb0a29e0f Prepare changelog for release 2.6.3 2020-10-16 11:50:12 +02:00
Sebastian Sdorra
46bcaa4eff Set support/2.6.x as development and main branch in order to release 2.6.3 2020-10-16 11:46:25 +02:00
Sebastian Sdorra
7ecbd632ba Make development and main branch configurable 2020-10-16 11:43:55 +02:00
Sebastian Sdorra
ca786c1a54 Fix missing default permission for managing public gpg keys 2020-10-16 11:11:58 +02:00
Sebastian Sdorra
553c90ec73 Fix missing default permission for managing public gpg keys 2020-10-16 08:26:20 +02:00
Sebastian Sdorra
d522ab186f Merge pull request #1370 from scm-manager/feature/handle_users_without_mail_address
Handle users without mail address
2020-10-15 15:00:16 +02:00
Sebastian Sdorra
27236cdbbd Use ValidatioUtil to check if the user id is a mail 2020-10-15 14:28:57 +02:00
Sebastian Sdorra
2d322e7020 Merge pull request #1375 from scm-manager/snyk-upgrade-b6f440509842a6368526333e7f5533ff
[Snyk] Upgrade org.jboss.resteasy:resteasy-core from 4.5.7.Final to 4.5.8.Final
2020-10-15 12:35:14 +02:00
Sebastian Sdorra
2ea019231a Document configuration for null checks 2020-10-15 11:58:20 +02:00
Sebastian Sdorra
465a9e635b Rename createFallbackMailAddress to more explicit getMailOrFallback 2020-10-15 11:48:17 +02:00
Sebastian Sdorra
775b37980d Use pull request root instead of files 2020-10-15 11:32:28 +02:00
Sebastian Sdorra
3cdc1faaa3 Improve javadoc of new configuration option mailDomainName 2020-10-15 11:32:27 +02:00
Sebastian Sdorra
e839ad32ea Use Nullable annotation to make clear that Email must be checked for null 2020-10-15 11:32:27 +02:00
Sebastian Sdorra
208fa0dcc8 Fix breaking change in RepositoryServiceFactory constructor
Deprecate old RepositoryServiceFactory constructor and create a new one to avoid breaking change in api
2020-10-15 11:32:27 +02:00
Sebastian Sdorra
ffd1daba52 There is no need for a class component here
We should use function component as much as possible, because their are easier to read and less confusing.
2020-10-15 11:32:27 +02:00
Sebastian Sdorra
e67ca28c5f Do not break existing core api 2020-10-15 11:32:19 +02:00
Florian Scholdei
ed4a564677 Update CHANGELOG.md 2020-10-15 00:38:29 +02:00
Florian Scholdei
ce56ec02d8 Add fullscreen option to diff view 2020-10-15 00:23:15 +02:00
snyk-bot
92f7e7fba9 fix: upgrade org.jboss.resteasy:resteasy-core from 4.5.7.Final to 4.5.8.Final
Snyk has created this PR to upgrade org.jboss.resteasy:resteasy-core from 4.5.7.Final to 4.5.8.Final.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-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-14 21:57:55 +00:00
Florian Scholdei
3b506bcaf1 Merge branch 'feature/fullscreen' of ssh://github.com/scm-manager/scm-manager into feature/fullscreen 2020-10-14 23:10:30 +02:00
Florian Scholdei
7631803492 Merge remote-tracking branch 'origin/develop' into feature/fullscreen 2020-10-14 23:09:06 +02:00
Florian Scholdei
ce955db17a Merge remote-tracking branch 'origin/develop' into feature/fullscreen 2020-10-14 22:49:30 +02:00
Florian Scholdei
c366203d1f New Fullscreen component 2020-10-14 22:48:10 +02:00
René Pfeuffer
8e93248dd6 Add component for commit author 2020-10-14 16:26:25 +02:00
René Pfeuffer
1d717acca0 Log change 2020-10-14 15:47:34 +02:00
René Pfeuffer
be6bb8bf37 Rename "mail host" to "mail domain name" 2020-10-14 15:46:50 +02:00
René Pfeuffer
e60ea987dd Make mail optional for user 2020-10-14 15:46:50 +02:00
René Pfeuffer
bb2b845015 Use email util to compute fallback mail address 2020-10-14 15:46:50 +02:00
René Pfeuffer
7fc7e33c0c Add fallback email to me dto 2020-10-14 15:46:50 +02:00
René Pfeuffer
343d0b9425 Create util class to get mail address 2020-10-14 15:46:50 +02:00
René Pfeuffer
9c233c1926 Add fallback mail host to global config 2020-10-14 15:46:50 +02:00
CES Marvin
bb9f1adc52 prepare for next development iteration 2020-10-14 12:38:13 +00:00
CES Marvin
eb126a5bbe release version 2.7.1 2.7.1 2020-10-14 12:03:24 +00:00
Eduard Heimbuch
fbffdea2a5 Adjust changelog for release 2.7.1 2020-10-14 13:57:39 +02:00