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
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
Florian Scholdei
dc83b50095
Create openapi docs for me endpoint and changesets
2020-02-18 17:20:23 +01:00
Eduard Heimbuch
1ff0c46b0e
add security requirements
2020-02-18 10:13:01 +01:00
Eduard Heimbuch
b7e95f3cc4
create openapi docs for scm-git-plugin
2020-02-17 14:09:26 +01:00
Eduard Heimbuch
7243f3d5a5
bootstrap openapi documentation
2020-02-17 13:42:48 +01:00
Rene Pfeuffer
97cc0e7b9c
Use access key directly, not the jwt token
2020-02-17 11:08:08 +01:00
Rene Pfeuffer
d513ebcd83
Prepare for next development iteration
2020-02-14 13:40:39 +01:00
Rene Pfeuffer
476dcc5758
Release version 2.0.0-rc4
2020-02-14 12:28:11 +01:00
Rene Pfeuffer
ab169670f0
Fix JavaDoc
2020-02-06 09:58:49 +01:00
Sebastian Sdorra
71c5f68878
implemented simple ClassLoaderLifeCycle to fix integration tests on Java > 8
2020-02-04 15:59:11 +01:00
Sebastian Sdorra
a36551597d
fix deprecation warning of Jackson ISO8601DateFormat
2020-02-04 15:27:30 +01:00
Sebastian Sdorra
00b5471ca7
fix some compiler warnings around hibernate-validator
2020-02-04 09:56:43 +01:00
Sebastian Sdorra
c20a50e9ec
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
Rene Pfeuffer
a7ff141986
Release version 2.0.0-rc3
2020-01-31 13:02:27 +01:00
Rene Pfeuffer
126b24b878
Cleanup code
2020-01-31 12:37:12 +01:00
Rene Pfeuffer
931133353d
Add detection of circular dependencies
2020-01-31 12:27:02 +01:00
Rene Pfeuffer
f92ea41ca3
Fix order of plugin nodes
2020-01-31 11:47:32 +01:00
Sebastian Sdorra
646b008af3
Prepare for next development iteration
2020-01-29 16:01:25 +01:00
Sebastian Sdorra
28040d0c65
release version 2.0.0-rc2
2020-01-29 15:22:54 +01:00
René Pfeuffer
bc112f8e1a
Merge with default
2020-01-28 07:37:55 +01:00
Rene Pfeuffer
02a9dafee4
Append self links to parsed diff results
2020-01-24 16:31:31 +01:00
Rene Pfeuffer
9fcaf5e69d
Change parsed diff url from '.json' to '/parsed'
2020-01-24 14:34:17 +01:00
Rene Pfeuffer
882a25936d
Add parsed diff endpoint for incoming diffs
2020-01-24 14:08:29 +01:00
Rene Pfeuffer
868cfb4a0a
Fix class name
2020-01-24 12:01:21 +01:00
Sebastian Sdorra
27c7c572f6
adjust unit tests to new language detection
2020-01-24 08:28:46 +01:00
Rene Pfeuffer
c0fd9b97b4
Cleanup code
2020-01-23 17:05:55 +01:00
Rene Pfeuffer
c80ee02d8a
Use plugin name from available plugin
2020-01-23 17:05:02 +01:00
Rene Pfeuffer
97600b26e2
Check plugin dependencies after download
2020-01-23 17:02:53 +01:00
Sebastian Sdorra
09bde1e3bb
use aceMode or codemirrorMode to determine programming language
2020-01-23 16:26:13 +01:00
Sebastian Sdorra
fe8e4db10b
added diff endpoint which returns a parsed diff as json
2020-01-22 15:49:50 +01:00
Eduard Heimbuch
f44d17d640
create RepositoryInitializer which can be used to create new files in the initial commit on a new repository
2020-01-20 15:19:51 +01:00
Sebastian Sdorra
3602976ff1
removed unnecessary plugin node wrapper
...
Removed PluginNodeHashWrapper and moved equals and hashCode logic into PluginNode
2020-01-16 10:27:34 +01:00
Rene Pfeuffer
2d755aae9a
Fix plugin load order
...
The old algorithm failed, because the tree below lead to the issue, that
the scm-branchwp-plugin was loaded before the scm-review-plugin was
ready.
This commit changes the order in the way, that leafs are loaded last.
+- scm-editor-plugin d
+- scm-branchwp-plugin a
+- scm-mail-plugin c
+- scm-review-plugin b
+- scm-branchwp-plugin a
+- scm-branchwp-plugin a
2020-01-16 08:56:57 +01:00
Rene Pfeuffer
96cda839f8
Simplify class
2020-01-15 14:00:20 +01:00
Rene Pfeuffer
c5520e6b07
Fix error handling on git push
...
Failing git push does not lead to an GitAPIException. Instead we have to
check the dedicated push update results.
By the way this adds a message for the internal repository exception.
2020-01-15 08:49:14 +01:00
