Commit Graph

12416 Commits

Author SHA1 Message Date
Sebastian Sdorra
1dfb688f21 Fix javadoc 2020-08-12 10:50:01 +02:00
Sebastian Sdorra
0861cd4ceb Merge pull request #1287 from scm-manager/bugfix/add_preselect_on_dropdown_if_missing
Add preselected value to options in DropDown if missing
2020-08-12 10:07:57 +02:00
Eduard Heimbuch
c1cfff603b fix review findings 2020-08-12 10:05:36 +02:00
eheimbuch
9a367aeec1 Merge pull request #1283 from scm-manager/feature/check_dependency_versions
Check dependency versions on plugin installation
2020-08-12 09:15:12 +02:00
Sebastian Sdorra
d08263fd22 Merge pull request #1288 from scm-manager/snyk-upgrade-97affcc0ca5d1006ba4641c122c635c4
[Snyk] Upgrade org.jboss.resteasy:resteasy-core from 4.5.5.Final to 4.5.6.Final
2020-08-12 06:55:21 +02:00
snyk-bot
b3ec7c005e fix: upgrade org.jboss.resteasy:resteasy-core from 4.5.5.Final to 4.5.6.Final
Snyk has created this PR to upgrade org.jboss.resteasy:resteasy-core from 4.5.5.Final to 4.5.6.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-08-11 21:59:46 +00:00
Konstantin Schaper
a4d0ff2b24 add story and update storyshots 2020-08-11 15:19:41 +02:00
Konstantin Schaper
e942359c3c fix issue with signature status text color and layout 2020-08-11 15:13:11 +02:00
Konstantin Schaper
5a5289f381 fix merge issues 2020-08-11 15:04:52 +02:00
Konstantin Schaper
8576b66559 Merge branch 'develop' into feature/create_gpg_signatures
# Conflicts:
#	CHANGELOG.md
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHookContextProvider.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
#	scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
2020-08-11 13:33:21 +02:00
Konstantin Schaper
0601770262 resolve review findings 2020-08-11 13:28:16 +02:00
Konstantin Schaper
f3d2c3d17b update storyshots 2020-08-11 10:12:25 +02:00
Konstantin Schaper
c9ccaed61d fix source buttons not displaying for file renaming 2020-08-11 10:09:28 +02:00
Sebastian Sdorra
ffc72394f1 Migrate tests to junit 5 2020-08-11 10:04:48 +02:00
Sebastian Sdorra
be857569d1 Migrate assertions to assert4j 2020-08-11 09:54:00 +02:00
Sebastian Sdorra
65da3cc710 Fix duplicate plugins in the plugin tree after update 2020-08-11 09:46:00 +02:00
Konstantin Schaper
94bac2ad37 update storyshots 2020-08-11 08:56:32 +02:00
Sebastian Sdorra
86e13db492 merge with develop branch 2020-08-11 08:19:54 +02:00
Sebastian Sdorra
99815f3845 Add version information to plugin tree output 2020-08-11 08:17:40 +02:00
Sebastian Sdorra
c736149461 Remove explicit default constructor 2020-08-11 08:14:07 +02:00
Sebastian Sdorra
77803d36e1 Use field for context and descriptor to avoid passing them to every method 2020-08-11 08:12:27 +02:00
Sebastian Sdorra
50608b0189 Fix minor review mentions 2020-08-11 08:07:06 +02:00
Konstantin Schaper
c69ab4ea65 refactor to use file control factory 2020-08-10 20:48:08 +02:00
Sebastian Sdorra
0dc84ed94e First check integrity of download, than check if dependencies are fulfilled
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2020-08-10 13:59:30 +02:00
Eduard Heimbuch
3549ce86ec Add preselected value to options in DropDown.tsx if missing 2020-08-10 13:59:24 +02:00
Sebastian Sdorra
1912084a71 Update CHANGELOG.md
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
2020-08-10 13:58:26 +02:00
Eduard Heimbuch
a46d8c4749 update documentation 2020-08-10 13:49:14 +02:00
Konstantin Schaper
08efc9421d Merge branch 'develop' into feature/source_jump
# Conflicts:
#	CHANGELOG.md
2020-08-10 12:37:05 +02:00
Konstantin Schaper
016adfca16 Merge pull request #1286 from scm-manager/bugfix/git_extension_not_allowed_backend
".git" extension not allowed on the end of repository name
2020-08-10 12:33:39 +02:00
Eduard Heimbuch
c813a5f723 ".git" extension not allowed on the end of repository name 2020-08-10 11:54:19 +02:00
Konstantin Schaper
87f3d78148 adjust displayed links depending on type of change 2020-08-10 11:50:56 +02:00
Eduard Heimbuch
a9bf3c54e6 merge with develop 2020-08-10 11:39:18 +02:00
Eduard Heimbuch
6ab80236f7 change cypress tests to ui only 2020-08-10 11:36:46 +02:00
Sebastian Sdorra
742c58a282 Fix some SonarQube warning 2020-08-10 11:20:31 +02:00
Sebastian Sdorra
f25e609e18 Remove invalid sign property 2020-08-10 11:20:17 +02:00
Sebastian Sdorra
2e2ed3729a Add missing since javadoc annotation 2020-08-10 11:19:52 +02:00
Sebastian Sdorra
4dec7ebe7b Merge pull request #1278 from scm-manager/feature/merge_detection
Introduce merge detection for receive hooks
2020-08-10 10:37:05 +02:00
Eduard Heimbuch
5e7739480b cleanup 2020-08-10 09:28:54 +02:00
Sebastian Sdorra
e7535903f7 Fix unit test on platforms which are not using UTF-8 as default 2020-08-10 09:22:29 +02:00
Sebastian Sdorra
c843d4ecf9 Merge pull request #1279 from scm-manager/snyk-upgrade-933283ed73b4e80e7a4e288618843fce
[Snyk] Upgrade net.java.dev.jna:jna from 5.5.0 to 5.6.0
2020-08-10 09:13:11 +02:00
Sebastian Sdorra
3e2c01af6f Merge branch 'develop' into feature/merge_detection
# Conflicts:
#	CHANGELOG.md
2020-08-10 08:57:19 +02:00
Sebastian Sdorra
3ea55c3422 Fix small SonarQube findings 2020-08-10 08:53:49 +02:00
Konstantin Schaper
eb38c6d8d8 Merge pull request #1277 from scm-manager/bugfix/git_extension_not_allowed
repository name may not end with ".git" extension
2020-08-09 23:52:51 +02:00
Konstantin Schaper
a47b349952 add tests for name validation change 2020-08-09 23:30:31 +02:00
René Pfeuffer
1ffe68484f Add documentation for integration tests 2020-08-07 20:54:23 +02:00
René Pfeuffer
264ad2bef1 Migrate to JUnit 5 2020-08-07 17:25:23 +02:00
Konstantin Schaper
30aa592d73 Merge branch 'develop' into feature/create_gpg_signatures
# Conflicts:
#	CHANGELOG.md
#	yarn.lock
2020-08-07 15:13:29 +02:00
Sebastian Sdorra
e2e74e73af Remove unused imports 2020-08-07 14:18:30 +02:00
Konstantin Schaper
76b561414c fix tests 2020-08-07 14:17:54 +02:00
Eduard Heimbuch
fa3f3bd135 delete cypress examples 2020-08-07 13:14:28 +02:00