Eduard Heimbuch
29a6b42fce
Check for external merge tools during merge
...
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-06-25 05:50:04 +02:00
CES Marvin
a0db5326be
Prepare for next development iteration
2024-06-24 12:35:52 +00:00
CES Marvin
bad14dfcfa
Release version 3.2.2
2024-06-24 12:23:27 +00:00
Viktor Egorov
5d446278d9
Fixed branch name limit
...
Pushed-by: Viktor Egorov<viktor.egorov-extern@cloudogu.com >
Co-authored-by: Viktor<viktor.egorov@triology.de >
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Pushed-by: Thomas Zerr<thomas.zerr@cloudogu.com >
2024-06-10 13:21:30 +02:00
CES Marvin
0ffd80310b
Prepare for next development iteration
2024-05-31 09:18:21 +00:00
CES Marvin
a0e464bed6
Release version 3.2.1
2024-05-31 09:03:24 +00:00
René Pfeuffer
2222a78baa
Merge branch 'main' into develop
2024-05-30 10:40:03 +02:00
René Pfeuffer
ae53ff2494
Merge tag '2.46.3'
...
Release version 2.46.3
2024-05-30 10:39:05 +02:00
CES Marvin
87a727b587
Release version 2.46.3
2024-05-29 12:02:24 +00:00
René Pfeuffer
ea4a148d86
Fix determination of default branch for git config on push
2024-05-29 10:40:28 +02:00
René Pfeuffer
e79ad2b1b8
Prepare for next development iteration
2024-05-29 10:34:19 +02:00
CES Marvin
c663879137
Prepare for next development iteration
2024-05-23 11:38:26 +00:00
CES Marvin
458d72002c
Release version 3.2.0
2024-05-23 10:50:27 +00:00
Viktor Egorov
c8ef99cf07
Add option to hide whitepace changes in diffs
...
Co-authored-by: Florian Scholdei<florian.scholdei@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
Reviewed-by: Florian Scholdei <florian.scholdei@cloudogu.com >
2024-05-14 11:33:48 +02:00
CES Marvin
56f335468d
Prepare for next development iteration
2024-04-09 08:38:52 +00:00
CES Marvin
a896fc08c9
Release version 3.1.0
2024-04-09 07:52:08 +00:00
Laura Gorzitze
8d12862ff8
Display all tags for changeset
...
Display of all tags (as links to the overview of the specific tag) of a given changeset in the changeset detail view.
2024-03-11 17:09:59 +01:00
Rene Pfeuffer
658ccdf006
Improve import of LFS files for pull and mirror
...
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-03-11 11:13:42 +01:00
CES Marvin
d12052d61b
Prepare for next development iteration
2024-03-07 17:25:36 +00:00
CES Marvin
6b99d66d26
Release version 3.0.4
2024-03-07 16:45:23 +00:00
CES Marvin
b7eaad4c3d
Release version 2.46.2
2024-03-05 08:40:39 +00:00
Laura Gorzitze
98a6fd185e
Prepare for next development iteration
2024-03-04 14:45:54 +01:00
CES Marvin
5d280a1531
Prepare for next development iteration
2024-02-08 09:32:25 +00:00
CES Marvin
adf53ec641
Release version 3.0.3
2024-02-08 08:50:57 +00:00
CES Marvin
7543bd7c8e
Prepare for next development iteration
2024-02-07 13:38:59 +00:00
CES Marvin
de3b468e3a
Release version 3.0.2
2024-02-07 12:57:01 +00:00
Laura Gorzitze
d8e1f2d739
Cleanup Code
...
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-02-06 14:54:00 +01:00
CES Marvin
b34a989c57
Prepare for next development iteration
2024-02-02 15:14:42 +00:00
CES Marvin
a8b3c80df0
Release version 3.0.1
2024-02-02 14:33:24 +00:00
CES Marvin
d8081ed074
Prepare for next development iteration
2024-01-29 15:44:46 +00:00
CES Marvin
3c5d8244d8
Release version 3.0.0
2024-01-29 15:29:36 +00:00
Eduard Heimbuch
22cb98d3d5
Bump gradle-smp-plugin to 0.16.3
2024-01-29 13:36:30 +01:00
Eduard Heimbuch
ab790514cb
Bump gradle-smp-plugin to 0.16.2
2024-01-15 18:55:01 +01:00
Eduard Heimbuch
cf4d9cf20f
3.x
...
Committed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2023-11-30 17:02:44 +01:00
CES Marvin
6f55210812
Prepare for next development iteration
2023-11-22 11:15:19 +00:00
CES Marvin
fc7c125d78
Release version 2.48.1
2023-11-22 10:26:59 +00:00
CES Marvin
6cbb231c09
Prepare for next development iteration
2023-11-17 14:24:28 +00:00
CES Marvin
9ba45acfb3
Release version 2.48.0
2023-11-17 13:38:07 +00:00
Rene Pfeuffer
571e6ad92f
Add a modifications provider for hooks
...
This new modifications provider consistently computes the modifications caused by a push to a branch. In contrast to the changeset provider that often has been used before to check what has changed, this also works for forced updates, rebased branches and fast-forwards. Because these types of changes are normally only used with git, this provider (for now) has only been implemented for git.
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com >
Pushed-by: Alexander Dammeier<alexander.dammeier@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2023-11-16 13:18:40 +01:00
Florian Scholdei
a8c32b10de
Preferred checkout variant
...
Add ability to prioritize the repository checkout variants. These are displayed sorted.
Co-authored-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Pushed-by: Florian Scholdei<florian.scholdei@cloudogu.com >
Co-authored-by: Florian Scholdei<florian.scholdei@cloudogu.com >
Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
2023-11-15 13:27:48 +01:00
Laura Gorzitze
f641c1ef08
Assisted Injection for commands
...
Co-authored-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Co-authored-by: Laura Gorzitze<laura.gorzitze@cloudogu.com >
Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Pushed-by: Laura Gorzitze<laura.gorzitze@cloudogu.com >
2023-11-02 12:41:54 +01:00
Eduard Heimbuch
69c165749a
Show correct image diff if compare across multiple commits
...
Pass the ancestor commit as the old revision if it is set in the GitDiffResult. This fixes the image diff renderer if the pull requests consists of multiple commits to show the full diff instead of the changes between the latest two commits.
2023-11-01 14:05:54 +01:00
Konstantin Schaper
0bfc5183cc
Consolidate redundant frontend modules
...
Pushed-by: Konstantin Schaper<konstantin.schaper@cloudogu.com >
Committed-by: Konstantin Schaper<konstantin.schaper@cloudogu.com >
Co-authored-by: Konstantin Schaper<konstantin.schaper@cloudogu.com >
2023-10-13 08:15:27 +02:00
CES Marvin
92b24a76ec
Prepare for next development iteration
2023-10-11 11:22:34 +00:00
CES Marvin
f9564208de
Release version 2.47.0
2023-10-11 10:35:24 +00:00
Rene Pfeuffer
4033f71bfb
Bump JGit to v6.7.0.202309050840-r-scm1
...
Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com >
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com >
2023-09-26 08:16:04 +02:00
Thomas Zerr
b2472d85d0
Added force to push command for git and hg repos
...
Committed-by: Rene Pfeuffer <rene.pfeuffer@cloudogu.com >
2023-09-14 20:28:37 +02:00
Rene Pfeuffer
8352cf349c
Do not try to init non-git repos for git
...
The initialization to set the default branch in
git repositories should not be executed for
non-git repositories. Otherwise, this throws
exceptions in SVN repositories all the time
because the branch command is not supported.
Committed-by: Konstantin Schaper <konstantin.schaper@cloudogu.com >
2023-09-08 13:22:57 +02:00
tzerr
58571711d7
-changed: set Versions to next snapshot
2023-09-01 12:37:18 +02:00
tzerr
762fe7bd1e
Merge tag '2.46.1'
...
Release version 2.46.1
2023-09-01 12:03:40 +02:00
