Commit Graph

10485 Commits

Author SHA1 Message Date
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
Eduard Heimbuch
c1cfff603b fix review findings 2020-08-12 10:05:36 +02:00
Eduard Heimbuch
a46d8c4749 update documentation 2020-08-10 13:49:14 +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
René Pfeuffer
a3a26c057e Cleanup 2020-08-07 10:53:08 +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
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
René Pfeuffer
6f20781812 Add first integration tests for merge detection 2020-08-06 17:12:14 +02:00
Eduard Heimbuch
9f8cde331b add missing error handling 2020-08-06 16:55:16 +02:00
René Pfeuffer
072d8f15c9 Detect merges where branch has been deleted, too 2020-08-06 07:58:22 +02:00
snyk-bot
a2db97245e fix: upgrade net.java.dev.jna:jna from 5.5.0 to 5.6.0
Snyk has created this PR to upgrade net.java.dev.jna:jna from 5.5.0 to 5.6.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/net.java.dev.jna/jna/

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/e67572ee-5940-4f2b-93b0-dced62d7ed85?utm_source=github&utm_medium=upgrade-pr
2020-08-06 01:38:51 +00:00
René Pfeuffer
ac983d6067 Remove redundant code 2020-08-05 18:43:08 +02:00
René Pfeuffer
6bfefb3348 Introduce merge detection for receive hooks
Here we add a merge detection provider for pre and post receive hooks
and implement this new provider for git.
2020-08-05 17:57:50 +02:00
Eduard Heimbuch
50f60a6993 ".git" extension is not allowed on the end of the repository name since it confuses the git protocol 2020-08-05 16:08:21 +02:00
Eduard Heimbuch
1f64d04816 add missing permission checks 2020-08-05 15:05:07 +02:00
Eduard Heimbuch
4929784a2b create update step for migration of anonymous mode 2020-08-05 14:34:43 +02:00
René Pfeuffer
592282eb0f Fix versions 2020-08-04 17:34:33 +02:00
CES Marvin
7352bdf55b prepare for next development iteration 2020-08-04 14:29:12 +00:00
Eduard Heimbuch
9dc5d2da2b add cypress for ui e2e tests // add anonymous access e2e tests 2020-08-04 16:24:32 +02:00
CES Marvin
0394f8fd96 release version 2.3.1 2.3.1 2020-08-04 13:57:22 +00:00
Sebastian Sdorra
96509f245e prepare changelog for release 2.3.1 2020-08-04 15:51:17 +02:00
Eduard Heimbuch
7dc13b1168 add integration tests 2020-08-04 13:31:37 +02:00
Eduard Heimbuch
aba33aca67 fix redirects 2020-08-04 11:41:00 +02:00
René Pfeuffer
b3076f1997 Merge pull request #1276 from scm-manager/bugfix/protocol_url_outofscope
Avoid stacktrace logging when protocol url is accessed outside of request scope
2020-08-04 10:41:32 +02:00
Eduard Heimbuch
c8a111f78e fix redirects on protected routes for anonymous user 2020-08-04 09:39:37 +02:00
René Pfeuffer
4499076180 Fix versions 2020-08-04 08:18:19 +02:00
Sebastian Sdorra
5b8ec0b85e adds missing bind for RootURL 2020-08-04 06:43:43 +02:00
Eduard Heimbuch
4c9e96f7e2 add anonymous mode for webclient / change footer and redirects if user is anonymous / add login button if user is anonymous 2020-08-03 17:53:10 +02:00
René Pfeuffer
8a42277ec7 Merge pull request #1275 from scm-manager/feature/import_documentation
adds documentation for importing existing repositories
2020-08-03 16:54:48 +02:00