CES Marvin
c7309d8962
prepare for next development iteration
2020-08-14 08:51:55 +00:00
CES Marvin
81bfddd141
release version 2.4.0
2020-08-14 08:15:36 +00:00
Konstantin Schaper
5a5289f381
fix merge issues
2020-08-11 15:04:52 +02:00
Konstantin Schaper
8576b66559
Merge branch 'develop' into feature/create_gpg_signatures
...
# Conflicts:
# CHANGELOG.md
# scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHookContextProvider.java
# scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
# scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
2020-08-11 13:33:21 +02:00
Konstantin Schaper
0601770262
resolve review findings
2020-08-11 13:28:16 +02:00
Sebastian Sdorra
e7535903f7
Fix unit test on platforms which are not using UTF-8 as default
2020-08-10 09:22:29 +02:00
Sebastian Sdorra
3ea55c3422
Fix small SonarQube findings
2020-08-10 08:53:49 +02:00
Konstantin Schaper
30aa592d73
Merge branch 'develop' into feature/create_gpg_signatures
...
# Conflicts:
# CHANGELOG.md
# yarn.lock
2020-08-07 15:13:29 +02:00
René Pfeuffer
a3a26c057e
Cleanup
2020-08-07 10:53:08 +02:00
René Pfeuffer
2433c50d64
Add test for "real" merge commits
2020-08-07 08:01:13 +02:00
René Pfeuffer
6f20781812
Add first integration tests for merge detection
2020-08-06 17:12:14 +02:00
René Pfeuffer
072d8f15c9
Detect merges where branch has been deleted, too
2020-08-06 07:58:22 +02:00
René Pfeuffer
ac983d6067
Remove redundant code
2020-08-05 18:43:08 +02:00
René Pfeuffer
6bfefb3348
Introduce merge detection for receive hooks
...
Here we add a merge detection provider for pre and post receive hooks
and implement this new provider for git.
2020-08-05 17:57:50 +02:00
Konstantin Schaper
7072761ba1
implementation and unit tests
2020-08-05 13:02:02 +02:00
René Pfeuffer
592282eb0f
Fix versions
2020-08-04 17:34:33 +02:00
CES Marvin
7352bdf55b
prepare for next development iteration
2020-08-04 14:29:12 +00:00
CES Marvin
0394f8fd96
release version 2.3.1
2020-08-04 13:57:22 +00:00
René Pfeuffer
b3076f1997
Merge pull request #1276 from scm-manager/bugfix/protocol_url_outofscope
...
Avoid stacktrace logging when protocol url is accessed outside of request scope
2020-08-04 10:41:32 +02:00
René Pfeuffer
4499076180
Fix versions
2020-08-04 08:18:19 +02:00
Konstantin Schaper
08a025ba81
wip
2020-08-03 16:09:37 +02:00
Sebastian Sdorra
030ef30ffb
uses parent constructor with RootURL
2020-08-03 14:01:44 +02:00
Eduard Heimbuch
b22ead23de
show signature key on changeset
2020-07-29 15:43:14 +02:00
Eduard Heimbuch
ebb6a1fdb8
Merge branch 'develop' into feature/verify_gpg_signatures
2020-07-28 12:36:15 +02:00
CES Marvin
17da0b9a8a
prepare for next development iteration
2020-07-23 12:17:00 +00:00
CES Marvin
efda158d76
release version 2.3.0
2020-07-23 11:43:35 +00:00
Eduard Heimbuch
5e10f6b730
Invalidate branches cache synchronously on create new branch
2020-07-22 10:20:37 +02:00
Sebastian Sdorra
64da676348
revisit gpg api and use it with from git plugin
2020-07-22 08:22:04 +02:00
Sebastian Sdorra
7cb349242c
introduces GitChangesetConverterFactory
...
This change introduces a GitChangesetConverterFactory to allow injections for the GitChangesetConverter.
2020-07-21 07:34:14 +02:00
Sebastian Sdorra
6e27051ed9
use child injector pattern for git commands
...
We are using a Google Guice child injector to reduce the amount of injection dependencies for the GitRepositoryServiceResolver and the GitRepositoryServiceProvider.
2020-07-20 16:18:00 +02:00
Eduard Heimbuch
b182f5b2d0
add key value entry inputfield component
2020-07-09 10:05:27 +02:00
René Pfeuffer
775784a10b
Fix new version
2020-07-08 09:48:59 +02:00
CES Marvin
4279573633
prepare for next development iteration
2020-07-03 10:04:14 +00:00
CES Marvin
fcc4fd0960
release version 2.2.0
2020-07-03 09:33:30 +00:00
René Pfeuffer
528432c2be
Fix versions
2020-06-30 07:48:36 +02:00
CES Marvin
c5f2502e6f
prepare for next development iteration
2020-06-23 16:22:47 +00:00
CES Marvin
e5c7b4eda4
release version 2.1.1
2020-06-23 15:34:23 +00:00
René Pfeuffer
b2f68a2004
Merge remote-tracking branch 'origin/support/2.1.x' into develop
...
# Conflicts:
# CHANGELOG.md
2020-06-23 17:26:34 +02:00
René Pfeuffer
086a471161
Fix migration of non-bare git repositories
...
During the migration of git repositories from v1 to v2, we have to
create an "scmm" config section with the repository id of the current
repository. If this does not happen, further write requests to this
repository will fail, because the hooks cannot determine the id.
However, the migration failed to write this configuration for non-bare
repositories. Therefore this fix checks beforehand, whether a '.git'
folder exists in the date directory. If this is the case, we assume that
this is a non-bare repository and write the config file inside this
folder.
2020-06-23 11:47:52 +02:00
René Pfeuffer
e4ca2c2490
Prepare support version
2020-06-23 11:01:46 +02:00
CES Marvin
22881dd381
prepare for next development iteration
2020-06-18 11:31:16 +00:00
CES Marvin
b037053ec5
release version 2.1.0
2020-06-18 10:54:38 +00:00
René Pfeuffer
3e5ee53dc2
Adapt test to change from 52a09a9
2020-06-17 11:16:04 +02:00
eheimbuch
7ca781bc1c
Merge branch 'develop' into bugfix/diff_with_CR
2020-06-17 09:17:45 +02:00
René Pfeuffer
b3040678c5
Fix versions in package.json files
2020-06-16 10:58:37 +02:00
René Pfeuffer
bd4fc86db1
Only use LF for line breaks in diffs
...
Git uses LF for line breaks in diffs, not CR or other delimiters. When
we are using other delimiters for diving diff output into lines, too,
we can get errors because diff lines can contain CRs. When we try to
split such lines, we get exceptions because these lines cannot be parsed
2020-06-15 17:05:46 +02:00
Sebastian Sdorra
acc3306450
rename trailer to contributor
2020-06-10 11:08:11 +02:00
René Pfeuffer
fdf6991b16
Simplify API
2020-06-08 13:10:36 +02:00
René Pfeuffer
cf02192315
Extract committer as trailer in git
2020-06-08 12:21:17 +02:00
René Pfeuffer
3f2dee6530
Update versions in package.json files
2020-06-05 07:47:55 +02:00
