Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 13:35:44 +01:00
Code Issues Packages Projects Releases Activity
11,849 Commits 32 Branches 207 Tags
0d3339b0cbe828b593fa9e81b9708b370dfc60eb
Commit Graph

943 Commits

Author SHA1 Message Date
Sebastian Sdorra
8bf82213b8 remove unused imports 2019-01-30 14:48:37 +01:00
Sebastian Sdorra
f8f5237ad0 fix usage of deprecated mockito classes 2019-01-30 14:44:38 +01:00
Sebastian Sdorra
69dda6403d update resteasy to v3.6.2.Final in order to fix CVE-2017-7561 and CVE-2016-6347 2019-01-30 13:21:11 +01:00
Sebastian Sdorra
c42028433f map nonFastForwardDisallowed field from GitConfig and added ui 2019-01-29 10:26:11 +01:00
Sebastian Sdorra
b231499cd0 merge with branch 1.x 2019-01-29 09:42:03 +01:00
Florian Scholdei
f20d3664a9 merged master 2019-01-23 13:46:46 +01:00
René Pfeuffer
760a37409b Specify global permissions 2019-01-21 09:17:43 +01:00
Florian Scholdei
9dc7882c54 clarified langs, added repo settings menu, changed git config binding, fixed small css issue with div in navi 2019-01-18 17:28:38 +01:00
René Pfeuffer
80466c9700 Collect descriptions from plugins 2019-01-18 15:33:33 +01:00
Johannes Schnatterer
32b0341649 Security System: Query permission.xmls from uber classloader. 
Allows for finding permission.xmls from plugins.
Adds an examplary permission.xml for git plugin.
 2018-12-20 17:56:28 +01:00
René Pfeuffer
3b33b3b0a4 Merge with 2.0.0-m3 2018-12-20 10:55:40 +01:00
René Pfeuffer
d9bfddce2d Add documentation about status codes 2018-12-20 10:47:24 +01:00
René Pfeuffer
ffa013de68 Merge with 2.0.0-m3 2018-12-20 10:44:44 +01:00
René Pfeuffer
547947a1b3 Add zip for test 2018-12-19 14:38:29 +01:00
René Pfeuffer
a9300df7f4 Fix incoming diff with merges from target branch. 
Taking the git history example below, the previous version only computed
commits 'b3' upward for log of 'b' with ancestor 'master' and missed
commits 'b1', 'b2' and the first merge.

* 86e9ca0 (HEAD -> b) b5
*   d69edb3 Merge branch 'master' into b
|\
| * 946a8db (master) f
| * b19b9cc e
* | 3d6109c b4
* | 6330653 b3
* |   a49a28e Merge branch 'master' into b
|\ \
| |/
| * 0235584 d
| * 20251c5 c
* | 5023b85 b2
* | 201ecc1 b1
|/
* 36b19e4 b
* c2190a9 a
 2018-12-19 13:33:57 +01:00
René Pfeuffer
2df50b833e Add constructor 2018-12-19 09:30:36 +01:00
René Pfeuffer
07c34a005e Peer review 2018-12-18 16:55:13 +01:00
Philipp Czora
161885ff12 Fixed issue with branch selector 2018-12-14 20:20:00 +01:00
René Pfeuffer
5cb1a2e0cd Use abstract base class for json enrichment 2018-12-14 17:25:42 +01:00
Philipp Czora
8a6a235e77 Implement Git repo config 2018-12-14 16:01:57 +01:00
René Pfeuffer
c2d872bd59 Modify git HEAD on default branch change 2018-12-13 18:32:20 +01:00
René Pfeuffer
360cba6c50 Use constant 2018-12-13 11:32:44 +01:00
René Pfeuffer
9e963b6aeb Enrich repository collection, too 2018-12-13 10:00:03 +01:00
René Pfeuffer
24cd9c3f8c Introduce repository config change event to clear caches 2018-12-13 09:22:10 +01:00
René Pfeuffer
db092e57e7 Move cache event to central position 2018-12-12 18:49:38 +01:00
René Pfeuffer
dbbe467479 Remove old property for default branch 2018-12-12 17:30:23 +01:00
René Pfeuffer
b4081aaa99 Add endpoint to set default branch 2018-12-12 15:04:56 +01:00
René Pfeuffer
bc8c776821 Introduce config rest endpoint for default git branch 2018-12-12 14:12:55 +01:00
Sebastian Sdorra
ee3e3d4ecc Merged in feature/merge_conflictResolution (pull request #126) 
Feature/merge conflictResolution
 2018-12-11 09:00:26 +00:00
Sebastian Sdorra
858d2816da fix wrong i18n key and added step 6 the push 2018-12-11 09:53:40 +01:00
Maren Süwer
f834dd5297 update information 2018-12-10 15:56:21 +01:00
Maren Süwer
5902dfab6a refactor 2018-12-10 15:47:46 +01:00
Maren Süwer
e636d409ed correct error throwing in apiclient and add extension point 2018-12-10 15:36:52 +01:00
Sebastian Sdorra
8d27449c86 merge with 2.0.0-m3 2018-12-10 14:06:44 +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
René Pfeuffer
8b518d320d Fix checkout of target branch 2018-12-10 08:59:19 +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
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
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
d889cf0831 Fix permission check 2018-12-05 17:25:10 +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
René Pfeuffer
3021bea65a Multiply floating store factories for type safety 2018-12-04 08:56:39 +01:00