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
11,495 Commits 42 Branches 214 Tags
e8044747e3005f89decd61ffcf7bb8df82ed8aae
Commit Graph

3840 Commits

Author SHA1 Message Date
Konstantin Schaper
e8044747e3 fix review findings 2020-12-01 11:18:19 +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
f0f9aad8de make method name clearer 2020-12-01 09:12:47 +01:00
Sebastian Sdorra
d5cec1c000 Fixed unexpected mercurial server pool stop 2020-11-30 16:23:44 +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
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
Sebastian Sdorra
52f26ab9e7 Merge with develop branch 2020-11-27 10:47:47 +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
Konstantin Schaper
7895da0a2a implement frontend for creating tags 2020-11-27 08:49:10 +01: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
490b566066 Merge pull request #1447 from scm-manager/feature/validate_translation_files 
Validate translation files
 2020-11-26 15:18:52 +01:00
René Pfeuffer
f390830e83 Merge pull request #1439 from scm-manager/feature/commit_date_for_branch 
Feature "Commit Date for Branch"
 2020-11-26 09:37:23 +01:00
Eduard Heimbuch
713b57a212 Merge pull request #1444 from scm-manager/dependabot/maven/scm-webapp/com.cronutils-cron-utils-9.1.3 
Bump cron-utils from 8.1.1 to 9.1.3 in /scm-webapp
 2020-11-26 08:59:13 +01:00
René Pfeuffer
9d25a93558 Distinct between active and stale branches 2020-11-26 08:31:14 +01:00
René Pfeuffer
541933a03a Show last commit of branch in ui 2020-11-26 08:31:14 +01:00
Eduard Heimbuch
b59616572a Merge pull request #1413 from scm-manager/snyk-upgrade-8c5af34ae9866fb87ba851f86530a074 
[Snyk] Upgrade com.github.spullara.mustache.java:compiler from 0.9.6-scm1 to 0.9.7
 2020-11-26 08:03:08 +01:00
Konstantin Schaper
e3170543cb add frontend for deleting tags 2020-11-25 15:51:44 +01:00
Konstantin Schaper
84ea159741 add unit test for rest endpoints 2020-11-25 12:08:51 +01:00
Konstantin Schaper
d0feb7c22c implement hg tag command and add rest endpoints 2020-11-25 11:29:06 +01:00
René Pfeuffer
8e7d0d87af Validate 'plugins.json' files from core 2020-11-25 10:31:42 +01:00
dependabot[bot]
13906dce2d Bump cron-utils from 8.1.1 to 9.1.3 in /scm-webapp 
Bumps [cron-utils](https://github.com/jmrozanec/cron-utils) from 8.1.1 to 9.1.3.
- [Release notes](https://github.com/jmrozanec/cron-utils/releases)
- [Commits](https://github.com/jmrozanec/cron-utils/compare/8.1.1...9.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-25 00:29:15 +00:00
CES Marvin
4752fdeea1 prepare for next development iteration 2020-11-24 18:59:15 +00:00
Jenkins Agent User
7f807bcfa0 Merge branch 'master' into develop 2020-11-24 18:58:46 +00:00
CES Marvin
b283f782ab release version 2.10.1 2020-11-24 18:22:43 +00:00
René Pfeuffer
f3d25e0440 Merge pull request #1442 from scm-manager/feature/improve_plugin_update_logging 
Improve logging for plugin update installation
 2020-11-24 18:52:15 +01:00
René Pfeuffer
fc9176ec5a No exception for missing file on cancelled installation 2020-11-24 18:31:18 +01:00
René Pfeuffer
b67a0cb89d Improve logging for failures during plugin installation 2020-11-24 18:31:18 +01:00
René Pfeuffer
2645b0b066 Name not matching condition in exception 2020-11-24 13:59:58 +01:00
René Pfeuffer
33e7a1374d Merge branch 'develop' into feature/hg_hooks_over_tcp 2020-11-20 14:33:10 +01:00
CES Marvin
9baa1f930b prepare for next development iteration 2020-11-20 10:22:37 +00:00
CES Marvin
a4d0771f6f release version 2.10.0 2020-11-20 09:36:03 +00:00
Sebastian Sdorra
0841a0a409 Merge branch 'feature/hg_hooks_over_tcp' of github.com:scm-manager/scm-manager into feature/hg_hooks_over_tcp 2020-11-19 14:34:56 +01:00
Eduard Heimbuch
0b96e7d08b Merge branch 'develop' into feature/hg_hooks_over_tcp 2020-11-19 14:31:00 +01:00
Sebastian Sdorra
1311061c82 Pass transaction id from request to mercurial hooks 2020-11-19 14:30:39 +01:00
René Pfeuffer
d8721878fc Merge pull request #1434 from scm-manager/feature/improve_resources 
Feature/improve resources
 2020-11-19 14:00:58 +01:00
René Pfeuffer
69a3a8a2da Convert update dto classes to interfaces 2020-11-19 13:19:49 +01:00
Sebastian Sdorra
29faa5ec6c Fix review findings 2020-11-19 12:22:52 +01:00
Eduard Heimbuch
3132dbc0f8 remove obsolete tests 2020-11-19 09:50:35 +01:00
René Pfeuffer
bab4a56e22 Make dtos for schema docs unusable 2020-11-19 07:48:21 +01:00
Florian Scholdei
ec87ccca9d Minor corrections to resources and dtos 2020-11-18 17:12:04 +01:00
Florian Scholdei
9f0a93978c Add examples to core resources and create DTO adapted to schemata 2020-11-18 17:12:04 +01:00
Sebastian Sdorra
58a0c515b0 Merge with develop branch 2020-11-18 10:07:28 +01:00
René Pfeuffer
6d2eab1342 Merge pull request #1430 from scm-manager/feature/ignore_codes_on_tracing 
Enhance trace api with accepted status codes
 2020-11-17 17:50:52 +01:00
Eduard Heimbuch
4411e24ea7 add test 2020-11-17 12:57:49 +01:00
Eduard Heimbuch
65884a9168 Enhance trace api to set codes which are accepted as successful. This way requests can be traced as successful even if the response code is 4xx or 5xx. 2020-11-17 12:51:11 +01:00
Eduard Heimbuch
3f5bfd1d03 Merge pull request #1423 from scm-manager/feature/improve_group_resources 
Feature/improve group resources
 2020-11-17 10:40:29 +01:00
Eduard Heimbuch
831aa09cff Merge branch 'develop' into feature/delete_branches 2020-11-12 14:58:51 +01:00