Commit Graph

11220 Commits

Author SHA1 Message Date
Konstantin Schaper
616e1efc97 Merge branch 'develop' into bugfix/api-key-to-access-token 2020-11-03 14:48:39 +01:00
Konstantin Schaper
36b6b221a4 update changelog 2020-11-03 14:47:55 +01:00
Konstantin Schaper
621ed5b827 update unit test name 2020-11-03 14:43:06 +01:00
eheimbuch
e9b8ab5560 Merge pull request #1405 from scm-manager/feature/update_java
Update java
2020-11-03 11:53:52 +01:00
Konstantin Schaper
5c42c3b49d update unit test 2020-11-03 11:42:44 +01:00
René Pfeuffer
683982d78b Merge pull request #1402 from scm-manager/bugfix/rest-download
user agents are not longer set to be browsers by default
2020-11-03 11:01:58 +01:00
Eduard Heimbuch
fd898240af Update java 2020-11-03 10:31:12 +01:00
René Pfeuffer
4b15468e67 Merge remote-tracking branch 'origin/develop' into bugfix/rest-download 2020-11-03 10:23:00 +01:00
René Pfeuffer
836e48c895 Remove deprecated api calls 2020-11-03 09:58:55 +01:00
René Pfeuffer
38180e40d0 Replace deprecated api in tests 2020-11-03 09:56:06 +01:00
René Pfeuffer
f6fef38615 Order arguments 2020-11-03 09:55:49 +01:00
Sebastian Sdorra
b5a91a3e79 Merge pull request #1403 from scm-manager/bugfix/anonymous-ssh-clone
Bugfix/anonymous ssh clone
2020-11-03 08:40:05 +01:00
Sebastian Sdorra
aa9ac3b020 Remove unnecessary public modifier of jUnit5 test 2020-11-03 08:32:14 +01:00
Sebastian Sdorra
9fe065f796 Merge pull request #1399 from scm-manager/feature/default_branch
Make default branch for git configurable
2020-11-03 08:23:03 +01:00
Konstantin Schaper
56331c4201 use api key scope when creating access tokens from api keys instead of full user scope 2020-11-02 17:13:13 +01:00
Sebastian Sdorra
14ccd2776b Merge pull request #1404 from scm-manager/bugfix/branches_link
Fix branches link
2020-11-02 16:54:07 +01:00
Konstantin Schaper
578e028d5b Merge branch 'develop' into bugfix/rest-download 2020-11-02 13:28:44 +01:00
Konstantin Schaper
22e0944377 fix review findings 2020-11-02 13:27:18 +01:00
Sebastian Sdorra
66024f249d Merge branch 'develop' of github.com:scm-manager/scm-manager into develop 2020-11-02 10:43:15 +01:00
Sebastian Sdorra
b6b0736cd9 Make JwtAccessTokenBuilderTest more robust 2020-11-02 10:41:21 +01:00
Konstantin Schaper
62d75fa0f8 Merge branch 'develop' into bugfix/anonymous-ssh-clone 2020-11-02 10:10:36 +01:00
René Pfeuffer
5f99ece3bb Fix branches link
Without the trailing '/' further links like 'create' will lead to
illegal links because they will not be appended but will replace the
'branches' part.
2020-11-02 10:08:49 +01:00
René Pfeuffer
68d6d71c71 Merge pull request #1400 from scm-manager/bugfix/svn_diff_prop_changes
Fix svn diff with property changes
2020-11-02 09:54:38 +01:00
Sebastian Sdorra
5de4b49392 Improve display of binary values in svn diff 2020-11-02 09:16:47 +01:00
Sebastian Sdorra
7e575036a3 Exclude SCMSvnDiffGenerator from SonarQube duplication report
SCMSvnDiffGenerator is a copy of an internal SVNKit class, with small changes for SCM-Manger.
If we refactor the class, it could become very hard to merge it with upstream.
So we decided to stop duplication reports for this class.
2020-11-02 08:41:30 +01:00
Sebastian Sdorra
a336d2c676 Fix svn diff with property changes 2020-11-02 08:41:27 +01:00
René Pfeuffer
42299281ab Merge pull request #1397 from scm-manager/bugfix/git_submodule_without_tree
Bugfix/git submodule without tree
2020-10-30 19:17:43 +01:00
Konstantin Schaper
afbac9aa7b remove unused imports 2020-10-30 15:26:19 +01:00
Konstantin Schaper
8af822a1e9 update changelog 2020-10-30 15:25:14 +01:00
René Pfeuffer
56f99a643f Add documentation 2020-10-30 14:24:31 +01:00
René Pfeuffer
91d1e7a46d Fix validation 2020-10-30 14:24:31 +01:00
René Pfeuffer
5eea6e430e Remove code redundancies 2020-10-30 14:24:31 +01:00
René Pfeuffer
6195e4a290 Cleanup 2020-10-30 14:24:31 +01:00
René Pfeuffer
94b65e0e3a Cleanup order of class components 2020-10-30 14:24:31 +01:00
René Pfeuffer
c3baf274d1 Set default branch for repository on init 2020-10-30 14:24:31 +01:00
René Pfeuffer
8429b62cc3 Clean up class 2020-10-30 14:24:31 +01:00
René Pfeuffer
8f13f3203d Fix integration test 2020-10-30 14:24:31 +01:00
René Pfeuffer
854940a514 Fix unit test 2020-10-30 14:24:31 +01:00
René Pfeuffer
f29db73a13 Log change 2020-10-30 14:24:31 +01:00
René Pfeuffer
351e6de05d Harmonize branch validations 2020-10-30 14:24:31 +01:00
René Pfeuffer
e9a173616b Use branch from request if specified 2020-10-30 14:24:31 +01:00
René Pfeuffer
c2a7ed8869 Validate banch names 2020-10-30 14:24:31 +01:00
René Pfeuffer
5f21f1a97d Add help text 2020-10-30 14:24:31 +01:00
René Pfeuffer
39e521a8d4 Set default branch after initial commit 2020-10-30 14:12:56 +01:00
René Pfeuffer
c4735e7097 Show configured branch in case of error with competing modifications 2020-10-30 14:12:56 +01:00
Florian Scholdei
196ea227d2 Add new default branch option with 'main' as default 2020-10-30 14:12:56 +01:00
eheimbuch
b48bf24834 Merge pull request #1380 from scm-manager/feature/user_converter
Feature/user converter
2020-10-30 12:41:51 +01:00
Konstantin Schaper
0beb749f23 adjust scm client check and update unit test accordingly 2020-10-30 12:20:45 +01:00
Konstantin Schaper
3e6e32a749 add unit test 2020-10-30 12:14:52 +01:00
Eduard Heimbuch
0c8fe5a60c confirm password modal by enter key / fix password link for logged in user 2020-10-30 11:48:05 +01:00