Commit Graph

10512 Commits

Author SHA1 Message Date
Sebastian Sdorra
2ac77415e7 Merge with develop branch 2020-08-12 12:32:16 +02:00
Sebastian Sdorra
752745868a Split anonymous access e2e tests into separate files 2020-08-12 12:13:23 +02:00
Sebastian Sdorra
6fbb3b9d53 Remove replaceSpacesInTestId and normalize test id in createAttributesFroTesting 2020-08-12 10:54:16 +02:00
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
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
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
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
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
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
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
Sebastian Sdorra
e2e74e73af Remove unused imports 2020-08-07 14:18:30 +02:00
Eduard Heimbuch
fa3f3bd135 delete cypress examples 2020-08-07 13:14:28 +02:00
Eduard Heimbuch
dec78ebecd merge with develop 2020-08-07 13:06:53 +02:00
Eduard Heimbuch
e897be3c86 update CHANGELOG.md 2020-08-07 13:04:25 +02:00
Sebastian Sdorra
45ad4bdf09 Update changelog 2020-08-07 11:53:06 +02:00
Sebastian Sdorra
a447b44da3 Add missing translation for new exceptions 2020-08-07 11:48:26 +02:00
René Pfeuffer
a3a26c057e Cleanup 2020-08-07 10:53:08 +02:00
Sebastian Sdorra
d66f0ef141 Fix broken test and missing license headers 2020-08-07 10:52:20 +02:00
Eduard Heimbuch
914f5eb4bb Show session expired warning if the jwt token is expired 2020-08-07 10:07:44 +02:00
René Pfeuffer
fa560f9913 Use target dir of root pom
It looks like the variable scm.home is bound differently for the
dependency plugin and the jetty plugin, when scm-webapp was build
beforehand.
2020-08-07 09:55:26 +02:00
Sebastian Sdorra
49c980e9af Add missing PluginProcessor tests 2020-08-07 08:13:52 +02:00
René Pfeuffer
2433c50d64 Add test for "real" merge commits 2020-08-07 08:01:13 +02:00
Sebastian Sdorra
40390da241 Merge pull request #1282 from scm-manager/bugfix/docs_docker_logging_path
Fix path in documentation for path of logging.xml
2020-08-07 07:44:09 +02:00
René Pfeuffer
e814694314 Fix scm home folder for integration tests
This variable should be absolute, because otherwise this may resolve
to different directories. For instance the web server resolves the
relative path to the root of the parent pom, while the dependency
plugin resolves it to the path of the scm-it pom. This led to the
error, that the scm-integration-test-plugin was not copied to the
correct plugin directory and therefore was not installed by the test
scm server.
2020-08-07 07:44:01 +02:00
René Pfeuffer
ca63d15dd7 Fix path in documentation for path of logging.xml 2020-08-07 06:51:48 +02:00