Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-31 03:39:14 +01:00
Code Issues Packages Projects Releases Activity
9,537 Commits 40 Branches 210 Tags
3ffece1547ee467c0b8279b3ef6679dbcb0ad9a0
Commit Graph

3371 Commits

Author SHA1 Message Date
Sebastian Sdorra
e69cf1f7bb Merge branch 'develop' into feature/favourite_repository 2020-03-26 09:27:11 +01:00
René Pfeuffer
e38245e5bf Check for command before promotion 2020-03-25 11:12:02 +01:00
Eduard Heimbuch
16c89f4b9f Merge branch 'develop' of github.com:scm-manager/scm-manager into feature/favourite_repository 2020-03-25 10:28:58 +01:00
Eduard Heimbuch
fd12464af4 add RepositoryToHalMapper as interface to map a repositoryDto outside of webapp 2020-03-25 09:54:12 +01:00
Florian Scholdei
f1b34eb502 Changeover to MIT license (#1066) 
* prepare license-maven-plugin for license migration
* added license mapping for tsx files and added some more excludes
* Changeover to MIT license
* Fix build problems
* Delete old remaining licenses
* Add more exclude path for license checker
* Rename included netbeans license, add exclude .m2/repository/
* Specify .m2 exclude because not only repository/, also wrapper/ must match
* Add .cache/ exclude for license check
* Modify formatting of license in java classes to comply with convention and IDE
* Add IntelliJ documentation for license configuration
* Update CHANGELOG.md
* Exclude tmp/workspace/ dir for license check
* Edit README.md

Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
 2020-03-23 15:35:58 +01:00
René Pfeuffer
8e983265a6 Merge pull request #1065 from scm-manager/feature/use_buildin_eventsource 
Feature use built-in eventsource
 2020-03-23 09:59:13 +01:00
snyk-bot
6dacf6495a fix: upgrade org.hibernate.validator:hibernate-validator from 6.1.0.Final to 6.1.2.Final 
Snyk has created this PR to upgrade org.hibernate.validator:hibernate-validator from 6.1.0.Final to 6.1.2.Final.

See this package in NPM:
https://www.npmjs.com/package/org.hibernate.validator:hibernate-validator

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-03-22 01:37:25 +00:00
snyk-bot
86005e6a48 fix: upgrade io.jsonwebtoken:jjwt-api from 0.10.5 to 0.11.0 
Snyk has created this PR to upgrade io.jsonwebtoken:jjwt-api from 0.10.5 to 0.11.0.

See this package in NPM:
https://www.npmjs.com/package/io.jsonwebtoken:jjwt-api

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-03-21 01:35:21 +00:00
René Pfeuffer
b579b3f808 Merge pull request #1062 from scm-manager/snyk-upgrade-18f00f2333223a63a95c08fe0448bffd 
[Snyk] Upgrade org.assertj:assertj-core from 3.10.0 to 3.15.0
 2020-03-20 12:27:35 +01:00
René Pfeuffer
f5cfd0ca68 Adapt unit test to new mockito api 2020-03-20 11:44:28 +01:00
Sebastian Sdorra
8c917dbdef merge with develop branch 2020-03-20 11:17:50 +01:00
Sebastian Sdorra
f8f5aa2ebd X-SCM-Session-ID and X-SCM-Client could now be send via query parameter 
The use of query parameters is required for SSE, because the standard does not support header.
This works currently only for GET request to avoid parsing of request body.
 2020-03-20 11:10:05 +01:00
Sebastian Sdorra
9a18a1c201 merge with develop branch 2020-03-13 08:06:34 +01:00
Sebastian Sdorra
7f24fc8c9c prepare for next development iteration 2020-03-13 07:32:02 +01:00
CES Marvin
cabefa72fb release version 2.0.0-rc5 2020-03-12 21:11:54 +00:00
Sebastian Sdorra
51684bb11b remove no longer required log4j exclude 2020-03-12 13:46:30 +01:00
René Pfeuffer
b8ab729c45 Merge branch 'develop' into feature/browse_commit_with_limit 2020-03-09 08:40:29 +01:00
Sebastian Sdorra
8d2f117a6b update httpclient in order to fix security vulnerability 2020-03-04 13:27:47 +01:00
Sebastian Sdorra
8814696969 merge with default branch 2020-03-04 12:58:53 +01:00
Sebastian Sdorra
c262d5daf4 disable application logs durring ci build 2020-03-04 12:12:57 +01:00
Sebastian Sdorra
7785ea2d68 Merged in bugfix/openapi_errors (pull request #417) 
prevent using same classloader multiple times
 2020-03-04 08:31:08 +00:00
Eduard Heimbuch
8b738f52c1 add schema for response headers 2020-03-04 08:46:33 +01:00
Sebastian Sdorra
1160702ede merge with default branch 2020-03-03 16:00:30 +01:00
Sebastian Sdorra
f6368360c7 try to fix flappy unit tests, by using awaitility instead of Thread.sleep 2020-03-03 15:15:17 +01:00
Eduard Heimbuch
5897863f7e fix several openapi errors 2020-03-03 14:49:35 +01:00
Eduard Heimbuch
04d480684a prevent using same classloader multiple times 2020-03-03 10:39:07 +01:00
Eduard Heimbuch
e3099c16a2 update CHANGELOG.md 2020-03-02 11:32:01 +01:00
Eduard Heimbuch
8618a27ec8 remove obsolete properties from user and group 2020-03-02 11:26:15 +01:00
Eduard Heimbuch
b6208240ab remove obsolete repository fields 2020-03-02 11:18:57 +01:00
Eduard Heimbuch
aa05b8ede1 update openapi.md 2020-02-28 08:13:58 +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
e33d65b097 Merge with default 2020-02-25 16:37:17 +01: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
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
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
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
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
cbd86e8e5c Update rest resource annotations 2020-02-19 16:51:20 +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
Eduard Heimbuch
d103b52228 update rest resource annotations 2020-02-19 13:02:01 +01:00
Eduard Heimbuch
66a97450b6 update rest endpoint annotations 2020-02-19 10:44:21 +01:00
René Pfeuffer
fe1591171d Rename 'proceedFrom' to 'offset' 2020-02-19 09:23:23 +01:00
Rene Pfeuffer
6b3f36e7ea WIP 2020-02-18 17:56:22 +01:00
Florian Scholdei
dc83b50095 Create openapi docs for me endpoint and changesets 2020-02-18 17:20:23 +01:00