Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-23 04:20:10 +01:00
Code Issues Packages Projects Releases Activity
6,894 Commits 42 Branches 216 Tags
deedb573a696ebb3ff5d7c211b4e2df96ef2a67f
Commit Graph

6894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Sdorra
2a45f250ed Close branch feature/merge_endpoint 2018-12-10 12:20:12 +00:00
René Pfeuffer
868d1302d3 Merge with remote 2018-12-10 12:04:41 +01:00
René Pfeuffer
a54faf1233 Do not merge with fast forward 2018-12-10 12:01:13 +01:00
René Pfeuffer
0e333002db Create local branch for target during merge 2018-12-10 11:43:27 +01:00
Sebastian Sdorra
b08c291e82 merge with 2.0.0-m3 2018-12-10 11:34:06 +01:00
René Pfeuffer
8b518d320d Fix checkout of target branch 2018-12-10 08:59:19 +01:00
Sebastian Sdorra
97c4b0998b move changesets and avatar components to ui-components 2018-12-10 08:45:59 +01:00
Maren Süwer
040035e084 renaming 2018-12-10 08:42:29 +01:00
Maren Süwer
cc11f56bfa use new created error to fix test 2018-12-10 08:11:09 +01:00
René Pfeuffer
9bf802c095 Map not supported media type exceptions 2018-12-07 14:36:56 +01:00
Maren Süwer
6193c1edda update apiclient for 409 errors 2018-12-07 14:26:06 +01:00
René Pfeuffer
e3b36c6a5f Merge with 2.0.0-m3 2018-12-07 14:01:42 +01:00
René Pfeuffer
438339ae49 Unbind scm protocol after test 2018-12-07 13:33:58 +01:00
René Pfeuffer
8b97e00b36 Fix unit test 2018-12-07 13:28:21 +01:00
René Pfeuffer
8d622f548d Merged in bugfix/store_directory (pull request #124) 
fix the repository store directory location
 2018-12-07 11:56:54 +00:00
René Pfeuffer
ee75b50f18 Close branch bugfix/store_directory 2018-12-07 11:56:54 +00:00
René Pfeuffer
133655418f Merge with 2.0.0-m3 2018-12-07 12:55:14 +01:00
René Pfeuffer
830c155b3d Fix transport protocol 2018-12-07 10:10:50 +01:00
René Pfeuffer
261e41f8bf Handle not existing revisions in merge 2018-12-07 08:49:37 +01:00
René Pfeuffer
540a525bc3 Use SCM protocol for internal merge command 2018-12-07 08:19:14 +01:00
Mohamed Karray
8232938afd use protected constant and mutableSet for final field 2018-12-06 18:01:39 +01:00
Mohamed Karray
08d5ae4a1b merge 2018-12-06 17:38:03 +01:00
Mohamed Karray
d2227220de merge 2018-12-06 16:28:40 +01:00
Mohamed Karray
4dce232c43 fix the repository store directory location 2018-12-06 16:27:36 +01:00
Sebastian Sdorra
9966e5b567 Merged in bugfix/handle_invalid_tokens (pull request #123) 
Handle invalid tokens
 2018-12-06 11:47:18 +00:00
Sebastian Sdorra
1f12127d78 Close branch bugfix/handle_invalid_tokens 2018-12-06 11:47:18 +00:00
Sebastian Sdorra
2c0d40c184 fixed password validation in ui 2018-12-06 12:00:30 +01:00
René Pfeuffer
f447ae437b Check feature in "incoming" commands 2018-12-06 11:35:56 +01:00
René Pfeuffer
de6d52bad9 Introduce feature for incoming changes 2018-12-06 10:49:37 +01:00
René Pfeuffer
226dc75ddc Fix unit test 2018-12-06 08:56:57 +01:00
Mohamed Karray
970eb548b3 merge 2018-12-06 08:48:58 +01:00
Mohamed Karray
6b2125687e add the Incoming Resource to get incoming changesets and diff 2018-12-06 08:46:22 +01:00
René Pfeuffer
c328a94147 Handle invalid tokens 
Eg. after deletion of user signing keys for JWT tokens, resolving
tokens throws an Authentication Exception. This must be caught.
 2018-12-06 08:13:55 +01:00
René Pfeuffer
d889cf0831 Fix permission check 2018-12-05 17:25:10 +01:00
René Pfeuffer
641022ba01 Fix unit test 2018-12-05 17:05:58 +01:00
René Pfeuffer
244586e121 Add documentation 2018-12-05 17:03:02 +01:00
René Pfeuffer
ea35469008 Add merge links to repository resource 2018-12-05 16:46:31 +01:00
René Pfeuffer
35f73cdc18 Do not commit empty merges 2018-12-05 16:09:38 +01:00
René Pfeuffer
9a3b8c26fb Fix unit test 2018-12-05 16:01:34 +01:00
René Pfeuffer
8c9e38e395 Secure merge command 2018-12-05 15:32:30 +01:00
Sebastian Sdorra
7bcf7a4774 merge repository heads 2018-12-05 15:06:58 +01:00
Sebastian Sdorra
b53ab4d438 merge with feature/autocomplete 2018-12-05 15:05:56 +01:00
Sebastian Sdorra
bc2b52b86f close branch feature/ui_autocomplete 2018-12-05 14:50:29 +01:00
René Pfeuffer
7900b94011 Add resource for merges 2018-12-05 13:52:14 +01:00
Sebastian Sdorra
16eb433618 Merged in feature/jwt_refresh (pull request #121) 
Feature JWT Refresh
 2018-12-05 09:14:16 +00:00
Sebastian Sdorra
8aeb633337 Close branch feature/jwt_refresh 2018-12-05 09:14:16 +00:00
René Pfeuffer
553d564836 Document sonar exceptions 2018-12-05 09:27:31 +01:00
René Pfeuffer
3ce57bea72 Suppress accepted sonar issue 2018-12-04 18:57:43 +01:00
René Pfeuffer
8c8ed9d777 Merged in feature/store_for_repositories_v2 (pull request #120) 
Feature/store for repositories v2
 2018-12-04 17:55:27 +00:00
René Pfeuffer
1e71d02ff9 Close branch feature/store_for_repositories_v2 2018-12-04 17:55:27 +00:00