Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-04 19:30:51 +01:00
Code Issues Packages Projects Releases Activity
10,478 Commits 42 Branches 214 Tags
e9edd5ad8fe1eb5eed53e8d81ab4119ab28ea1b8
Commit Graph

10478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduard Heimbuch
e9edd5ad8f fix formatting with prettier 2020-08-12 12:53:59 +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
Konstantin Schaper
94bac2ad37 update storyshots 2020-08-11 08:56:32 +02:00
Konstantin Schaper
c69ab4ea65 refactor to use file control factory 2020-08-10 20:48:08 +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
87f3d78148 adjust displayed links depending on type of change 2020-08-10 11:50:56 +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
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
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
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
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
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 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