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
René Pfeuffer
a3a26c057e
Cleanup
2020-08-07 10:53:08 +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
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
6f20781812
Add first integration tests for merge detection
2020-08-06 17:12:14 +02:00
René Pfeuffer
072d8f15c9
Detect merges where branch has been deleted, too
2020-08-06 07:58:22 +02: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
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
CES Marvin
0394f8fd96
release version 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
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
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
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
Konstantin Schaper
a552e54d20
Update import.md
2020-08-03 14:33:53 +02:00
Konstantin Schaper
e930884c55
Update faq.md
2020-08-03 14:33:13 +02:00
Sebastian Sdorra
494e62109d
update changelog
2020-08-03 14:09:12 +02:00
Sebastian Sdorra
030ef30ffb
uses parent constructor with RootURL
2020-08-03 14:01:44 +02:00
Sebastian Sdorra
b981d62905
adds new constructor to InitializingHttpScmProtocolWrapper which uses the new RootURL api
2020-08-03 13:57:07 +02:00
Sebastian Sdorra
5bf4917914
adds RootURL which resolves the scm root url regardless of the guice scope
2020-08-03 13:37:16 +02:00
Sebastian Sdorra
2d5c62e77b
throws an exception if createForwardedBaseUrl is used with a non forwarded request
2020-08-03 13:36:23 +02:00
Sebastian Sdorra
1dd4494eac
fixes small sonarqube warning
2020-08-03 07:40:35 +02:00
Sebastian Sdorra
2400e465d3
migrate InitializingHttpScmProtocolWrapperTest to junit 5
2020-08-03 07:38:39 +02:00
Sebastian Sdorra
c907df564f
Update docs/en/import.md
...
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com >
2020-08-03 07:20:40 +02:00
Sebastian Sdorra
045516791c
Update docs/en/import.md
...
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com >
2020-08-03 07:20:22 +02:00
Sebastian Sdorra
0177b53dc9
Update docs/en/import.md
...
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com >
2020-08-03 07:20:12 +02:00
Sebastian Sdorra
3015419f32
Update docs/en/faq.md
...
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com >
2020-08-03 07:19:50 +02:00
Sebastian Sdorra
1b94f447d9
adds documentation for importing existing repositories
2020-08-02 12:35:55 +02:00
Sebastian Sdorra
a611fb0d66
Merge pull request #1271 from scm-manager/bugfix/tooltip_overflow
...
Fix tooltip overflow of help icons
2020-07-31 13:39:50 +02:00
Sebastian Sdorra
46e6c51e65
update storyshots to reflect latest tooltip changes
2020-07-31 13:00:15 +02:00
Sebastian Sdorra
d6d8b7ca8c
reenable pre-commit linting of js, ts and tsx files
2020-07-31 11:12:31 +02:00
Sebastian Sdorra
63e56ce84d
adjust changelog for latest tooltip changes
2020-07-31 10:54:26 +02:00
Sebastian Sdorra
3f1b7bbf5e
use multiline tooltips for help as default
2020-07-31 10:48:51 +02:00
Sebastian Sdorra
28d3983aed
remove short tooltips from long tooltip story
2020-07-31 10:48:14 +02:00
Sebastian Sdorra
d88704a009
improve modal stories to show overflow bug on form elements
2020-07-31 10:17:03 +02:00
Florian Scholdei
4268fed114
Add storyshot for our concrete bug case
2020-07-30 16:52:22 +02:00
Florian Scholdei
2490eccc71
Remove unused import
2020-07-30 13:04:12 +02:00
Florian Scholdei
1c21c72b20
Update CHANGELOG.md
2020-07-30 11:03:48 +02:00
Florian Scholdei
132a30f2b6
Fix tooltip overflow in checkbox and radio context
2020-07-30 11:02:30 +02:00
eheimbuch
02738b816c
Merge pull request #1220 from scm-manager/snyk-upgrade-f96802fbb6e2c00d5a6c3c825d7eb0b4
...
[Snyk] Upgrade bulma from 0.8.2 to 0.9.0
2020-07-23 14:52:03 +02:00
eheimbuch
a3d47b95aa
Merge pull request #1255 from scm-manager/snyk-fix-daa1575b57ffde8d8a9fa6654ce55cc7
...
[Snyk] Security upgrade i18next from 17.3.1 to 19.6.0
2020-07-23 14:41:13 +02:00
CES Marvin
17da0b9a8a
prepare for next development iteration
2020-07-23 12:17:00 +00:00
CES Marvin
efda158d76
release version 2.3.0
2020-07-23 11:43:35 +00:00
Sebastian Sdorra
49602c9a34
prepare changelog for release 2.3.0
2020-07-23 13:39:24 +02:00
Florian Scholdei
5a0841bd42
Update CHANGELOG.md
2020-07-23 13:04:46 +02:00
eheimbuch
460db05396
Merge pull request #1265 from scm-manager/feature/numbers_in_source
...
Feature/numbers in source
2020-07-23 11:26:12 +02:00
