Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-09 09:02:10 +01:00
Code Issues Packages Projects Releases Activity
11,493 Commits 34 Branches 209 Tags
a4d0acd7e2c6b00ededf267befd2caabd287a9c8
Commit Graph

11493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantin Schaper
a4d0acd7e2 declare tag support for hg 2020-12-01 09:33:43 +01:00
Konstantin Schaper
94a6ffcb04 fix merge error 2020-12-01 09:18:40 +01:00
Konstantin Schaper
2d8b744299 Merge branch 'develop' into feature/manage-tags 
# Conflicts:
#	scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java
#	scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagDto.java
 2020-12-01 09:17:11 +01:00
Konstantin Schaper
f810f1975e Merge pull request #1457 from scm-manager/bugfix/hg_server_pool_stop 
Fixed unexpected mercurial server pool stop
 2020-12-01 09:15:10 +01:00
Konstantin Schaper
3b3b8749b1 fix sonarlint issue 2020-12-01 09:13:47 +01:00
Konstantin Schaper
f0f9aad8de make method name clearer 2020-12-01 09:12:47 +01:00
René Pfeuffer
7a1e904246 Merge pull request #1459 from scm-manager/snyk-upgrade-d57eec4e85a9c1e6737ead2bd63372d2 
[Snyk] Upgrade org.apache.shiro:shiro-guice from 1.6.0 to 1.7.0
 2020-12-01 08:06:06 +01:00
snyk-bot
7a02f4e48f fix: upgrade org.apache.shiro:shiro-guice from 1.6.0 to 1.7.0 
Snyk has created this PR to upgrade org.apache.shiro:shiro-guice from 1.6.0 to 1.7.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.shiro/shiro-guice/

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-12-01 01:35:50 +00:00
René Pfeuffer
3d7720663f Fix typos 2020-11-30 17:54:56 +01:00
René Pfeuffer
8cd2c3f493 Use injector 2020-11-30 17:54:56 +01:00
René Pfeuffer
12fb2db0da Expose fact that git implements tag command 2020-11-30 16:47:28 +01:00
Sebastian Sdorra
d5cec1c000 Fixed unexpected mercurial server pool stop 2020-11-30 16:23:44 +01:00
Konstantin Schaper
d38340a16b update changelog 2020-11-30 16:07:48 +01:00
Konstantin Schaper
843e989ed6 fix tag link 2020-11-30 16:01:43 +01:00
Konstantin Schaper
e18480ad2b add permission check to hal links for tags 2020-11-30 15:25:29 +01:00
Konstantin Schaper
f575e038ec remove redundant code 2020-11-30 14:19:16 +01:00
Konstantin Schaper
8986e3d378 Merge branch 'develop' into feature/manage-tags 
# Conflicts:
#	scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
 2020-11-30 14:18:05 +01:00
Konstantin Schaper
7e46c3a491 wip fixes 2020-11-30 14:15:42 +01:00
Konstantin Schaper
e4346a6786 add missing images for docs 2020-11-30 10:01:53 +01:00
Konstantin Schaper
032982857f clean up code, fix bugs, improve ux, add docs 2020-11-30 10:01:21 +01:00
René Pfeuffer
b21824bf29 Merge pull request #1452 from scm-manager/bump_javahg_0.16 
Bump javahg to version 0.16
 2020-11-30 08:27:33 +01:00
René Pfeuffer
5c05d19d45 Merge pull request #1453 from scm-manager/snyk-upgrade-d8716cbf34c596aa85cbfad4098fe9c8 
[Snyk] Upgrade org.bouncycastle:bcpg-jdk15on from 1.66 to 1.67
 2020-11-30 07:55:43 +01:00
René Pfeuffer
a34581f892 Merge pull request #1454 from scm-manager/feature/docker_healthcheck 
Add healthcheck for docker image
 2020-11-30 07:50:46 +01:00
René Pfeuffer
1ee69244c8 Merge pull request #1455 from scm-manager/snyk-fix-503204e935898825e5d9c58961c099cb 
[Snyk] Fix for 1 vulnerabilities
 2020-11-30 07:38:27 +01:00
snyk-bot
99002b0b96 fix: pom.xml to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1047304
 2020-11-29 21:16:05 +00:00
Konstantin Schaper
ebc1120182 Merge branch 'feature/manage-tags' of github.com:scm-manager/scm-manager into feature/manage-tags 2020-11-29 20:10:14 +01:00
Konstantin Schaper
0f7df6d8a8 fix sonarqube finding 2020-11-29 20:09:59 +01:00
Sebastian Sdorra
02b22db19e Add healthcheck for docker image 2020-11-28 13:59:59 +01:00
snyk-bot
2a7972f4ef fix: upgrade org.bouncycastle:bcpg-jdk15on from 1.66 to 1.67 
Snyk has created this PR to upgrade org.bouncycastle:bcpg-jdk15on from 1.66 to 1.67.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.bouncycastle/bcpg-jdk15on/

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-11-28 01:35:15 +00:00
René Pfeuffer
51d0b5796e Bump javahg to version 0.16 2020-11-27 16:37:13 +01:00
René Pfeuffer
8ca64c3440 Fix signature check for git tags 2020-11-27 13:35:54 +01:00
René Pfeuffer
4e326fe7e5 Merge pull request #1416 from scm-manager/feature/hg_hooks_over_tcp 
Feature/hg hooks over tcp
 2020-11-27 13:12:07 +01:00
René Pfeuffer
d732100935 Fix typo 2020-11-27 13:11:42 +01:00
Konstantin Schaper
11ebba349c fix integration test 2020-11-27 13:08:42 +01:00
Konstantin Schaper
6652a039dd fix unit tests 2020-11-27 12:40:02 +01:00
René Pfeuffer
5f130c685c Fix german text 2020-11-27 11:49:13 +01:00
Konstantin Schaper
6dbbe7c817 display tag signature 2020-11-27 11:03:11 +01:00
Konstantin Schaper
dc4607935b improve ux 2020-11-27 10:48:56 +01:00
Sebastian Sdorra
52f26ab9e7 Merge with develop branch 2020-11-27 10:47:47 +01:00
Sebastian Sdorra
136cdbb6b0 Fix broken HgVersionCommand 
Use waitFor instead of exitValue to wait for process to finish
 2020-11-27 10:46:37 +01:00
René Pfeuffer
ef60880e20 Merge pull request #1450 from scm-manager/bugfix/content_detection_interpreter_parameter 
Fix language detection of files with interpreter parameters
 2020-11-27 09:04:26 +01:00
Sebastian Sdorra
8ee8c8b351 Merge branch 'develop' into feature/hg_hooks_over_tcp 
# Conflicts:
#	CHANGELOG.md
 2020-11-27 08:57:09 +01:00
René Pfeuffer
c442d9271e Merge pull request #1451 from scm-manager/snyk-upgrade-a3ff3c60d389420077910272327f99b5 
[Snyk] Upgrade org.assertj:assertj-core from 3.17.2 to 3.18.0
 2020-11-27 08:54:30 +01:00
Sebastian Sdorra
3e19f28cc0 Do not use socket.MSG_WAITALL 2020-11-27 08:50:22 +01:00
Konstantin Schaper
7895da0a2a implement frontend for creating tags 2020-11-27 08:49:10 +01:00
Sebastian Sdorra
7357d83b73 Use DataInputStream and DataOutputStream instead of manual reading and writing 2020-11-27 08:10:18 +01:00
snyk-bot
2a2324bbc3 fix: upgrade org.assertj:assertj-core from 3.17.2 to 3.18.0 
Snyk has created this PR to upgrade org.assertj:assertj-core from 3.17.2 to 3.18.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.assertj/assertj-core/

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
 2020-11-27 01:00:30 +00:00
Sebastian Sdorra
79a9b56135 Fix language detection of files with interpreter parameters 
Update spotter to version 3.0.1 in order to fix language detection of
files with a shebang which contains a parameter e.g. /usr/bin/make -f
 2020-11-26 16:06:33 +01:00
Sebastian Sdorra
aaeeed0ea5 Update smp plugin to version 1.4.0 2020-11-26 15:33:04 +01:00
Sebastian Sdorra
490b566066 Merge pull request #1447 from scm-manager/feature/validate_translation_files 
Validate translation files
 2020-11-26 15:18:52 +01:00