Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-19 14:02:13 +01:00
Code Issues Packages Projects Releases Activity
9,263 Commits 38 Branches 210 Tags
9c75ff95c8f50fd129c494aebc2e7240d7bcdbfc
Commit Graph

9263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rene Pfeuffer
9c75ff95c8 Keep file attributes on modification 2020-02-27 11:42:37 +01:00
Rene Pfeuffer
ba2b6e41e1 Log change 2020-02-27 10:38:47 +01:00
Eduard Heimbuch
2a16ec1b65 Merged in bugfix/merge_failures_without_conflicts (pull request #413) 
Handle unexpected merge results
 2020-02-27 09:35:43 +00:00
Eduard Heimbuch
d36063be24 Close branch bugfix/merge_failures_without_conflicts 2020-02-27 09:35:43 +00:00
Eduard Heimbuch
fbededbcaa cleanup test 2020-02-27 10:34:48 +01:00
Rene Pfeuffer
33037385e4 Handle unexpected merge results 
It is possible that a git work tree is dirty directly after the clone
of a repository, eg. when files are not changed correctly due to bogous
.gitattribute files (though this is just a guess). In these cases a
merge might fail due to these dirty files and not due to merge
conflicts. Without this change such results lead to null pointer
exceptions, because result.getConflicts() is null.
 2020-02-27 09:56:25 +01:00
Rene Pfeuffer
eb81bf4005 Enable tests for mercurial 
Therefore disable build in docker and use native worker.
 2020-02-27 08:36:47 +01:00
Sebastian Sdorra
5cd28f27c6 removed deprecated warnings plugin 2020-02-26 15:14:45 +01:00
Rene Pfeuffer
8c7c21eef9 Merged in feature/sort_extensionpoint_entries (pull request #410) 
Sorted extension point entries with supplied extensionName
 2020-02-25 15:23:56 +00:00
Rene Pfeuffer
2b0d4a65a0 Close branch feature/sort_extensionpoint_entries 2020-02-25 15:23:56 +00:00
Florian Scholdei
affb460584 Merge with upstream 2020-02-25 16:22:54 +01:00
Sebastian Sdorra
412cae3c21 do not try to archive restdocs package, because it does not exists anymore 2020-02-25 11:12:04 +01:00
Sebastian Sdorra
c64c584195 Merged in feature/openapi_doc (pull request #411) 
Feature/openapi doc
 2020-02-25 09:12:45 +00:00
Sebastian Sdorra
2fdd7f31ff Close branch feature/openapi_doc 2020-02-25 09:12:45 +00:00
Sebastian Sdorra
039ea46958 improve openapi description 2020-02-25 10:12:04 +01:00
Sebastian Sdorra
b3a9b8a42c remove heading, because the one from swagger-ui is enough 2020-02-25 10:10:15 +01:00
Florian Scholdei
a557997fa4 Simplify sort extensions method 2020-02-25 09:18:29 +01:00
Eduard Heimbuch
d85cfc23e2 fix typo in Changelog.md 2020-02-25 07:34:31 +00:00
Sebastian Sdorra
000dab88ca merge with default branch 2020-02-25 08:24:12 +01:00
Eduard Heimbuch
36469d64a1 Describe REST API in Swagger UI 2020-02-24 15:21:05 +01:00
Florian Scholdei
a5f27adc71 Described sort method in a more understandable way 2020-02-24 15:05:13 +01:00
Florian Scholdei
a016710c35 Sorted extension point entries with supplied extensionName 2020-02-24 15:02:03 +01:00
Eduard Heimbuch
7e1e77af2b remove enunciate since we are using openapi now 2020-02-24 13:36:34 +01:00
Florian Scholdei
6d9256ed99 Add content to 404 response 2020-02-24 08:55:17 +01:00
Eduard Heimbuch
1c681ea588 Merged in feature/update_node_and_yarn (pull request #409) 
update node and yarn
 2020-02-21 12:34:59 +00:00
Eduard Heimbuch
7025fbbc2f Close branch feature/update_node_and_yarn 2020-02-21 12:34:59 +00:00
Sebastian Sdorra
39846314cb update storyshots 2020-02-20 16:23:12 +01:00
Sebastian Sdorra
42841512c5 added example to AuthenticationResource 2020-02-20 16:17:06 +01:00
Sebastian Sdorra
c7bac50ff2 fixed authentication 2020-02-20 15:19:34 +01:00
Sebastian Sdorra
051e6f946f improved footer layout 2020-02-20 11:31:21 +01:00
Florian Scholdei
56202e5266 Remove unused imports, adding missing dots in descriptions, remove last TypeHint annotation 2020-02-19 17:00:33 +01:00
Florian Scholdei
841ea1e1b5 Merge with upstream 2020-02-19 16:52:25 +01:00
Florian Scholdei
cbd86e8e5c Update rest resource annotations 2020-02-19 16:51:20 +01:00
Sebastian Sdorra
938025e283 merge repository heads 2020-02-19 14:32:04 +01:00
Sebastian Sdorra
b98e82c388 update node and yarn 2020-02-19 14:30:52 +01:00
Florian Scholdei
154426ddd6 Merge with upstream 2020-02-19 13:52:24 +01:00
Florian Scholdei
6ea21f01ef Update rest resource annotations 2020-02-19 13:51:54 +01:00
Eduard Heimbuch
8fb463c26a update rest resource annotations 2020-02-19 13:51:43 +01:00
Sebastian Sdorra
8e39d53add added 3 column layout to footer 2020-02-19 13:35:04 +01:00
Sebastian Sdorra
a83ef175be added option to pass className prop to AvatarImage 2020-02-19 13:34:30 +01:00
Eduard Heimbuch
d103b52228 update rest resource annotations 2020-02-19 13:02:01 +01:00
Eduard Heimbuch
e030d2c347 merge 2020-02-19 12:32:56 +01:00
Eduard Heimbuch
66a97450b6 update rest endpoint annotations 2020-02-19 10:44:21 +01:00
Sebastian Sdorra
bd57acf138 ExtensionPoint now uses binder provided from context 2020-02-19 10:06:10 +01:00
Sebastian Sdorra
f96ebc98cd added stories for the footer 2020-02-19 09:49:31 +01:00
Sebastian Sdorra
f23b464524 use binder from context to make extensions it testable 2020-02-19 09:48:46 +01:00
Sebastian Sdorra
041a999a01 added context hook to allow the override of the default binder 2020-02-19 09:47:52 +01:00
Sebastian Sdorra
fac46d636f fixed wrong typing of me groups 2020-02-19 09:46:57 +01:00
Eduard Heimbuch
3f9d61ca99 inject props to each extension 2020-02-19 08:48:51 +01:00
Florian Scholdei
dc83b50095 Create openapi docs for me endpoint and changesets 2020-02-18 17:20:23 +01:00