Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-05 11:50:58 +01:00
Code Issues Packages Projects Releases Activity
10,929 Commits 42 Branches 214 Tags
4200aa12258dfe8dacb6de7ab606334bb9bb747d
Commit Graph

10929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Pfeuffer
4200aa1225 Add integration test for api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
a6814fb938 Delete api keys when user is deleted 2020-10-05 10:53:30 +02:00
René Pfeuffer
95bad28b0a Let api key realm check username/password authentication 2020-10-05 10:53:30 +02:00
René Pfeuffer
ec57dc0731 Add UI for api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
20345c895f Add created date to api key 2020-10-05 10:53:30 +02:00
René Pfeuffer
1def884779 Fix rest path 2020-10-05 10:53:30 +02:00
René Pfeuffer
25a87296a7 Add permission check 2020-10-05 10:53:30 +02:00
René Pfeuffer
bd247a4332 Rename role -> permissionRole 2020-10-05 10:53:30 +02:00
René Pfeuffer
4ec75781b7 Add scope from role for api token realm 2020-10-05 10:53:30 +02:00
René Pfeuffer
e3e96f7813 Use data instead of configuration store 2020-10-05 10:53:30 +02:00
René Pfeuffer
12ab218eba Add realm for api key 2020-10-05 10:53:30 +02:00
René Pfeuffer
91471c0ec0 Create rest endpoint to delete api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
0923c2d63e Create rest endpoint to create new api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
0dc96c2403 Use string tokens 2020-10-05 10:53:30 +02:00
René Pfeuffer
2f96ec0d21 Create and read tokens for api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
905fc4158a Add rest resource for api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
4129f55f27 Implement service for API keys 2020-10-05 10:53:29 +02:00
eheimbuch
a4af112000 Merge pull request #1358 from scm-manager/bugfix/horizontal_actionbar 
Align ActionBar items horizontal and enforce correct margin between them
 2020-10-05 09:32:31 +02:00
Sebastian Sdorra
e36ac62a32 Align actionbar item horizontal and enforce correct margin between them 2020-10-02 08:22:07 +02:00
René Pfeuffer
fb3ba789ea Increase test to fix flappy test 
CI fails from time to time in a way one gets, when the timeout is
reduced. So we increase the timeout here.
 2020-09-30 10:27:02 +02:00
CES Marvin
bc7d4ed9f6 prepare for next development iteration 2020-09-30 08:15:47 +00:00
CES Marvin
5887c5c268 release version 2.6.1 2.6.1 2020-09-30 07:32:54 +00:00
Eduard Heimbuch
e0058fb400 Adjust changelog for release 2.6.1 2020-09-30 09:26:12 +02:00
eheimbuch
46e4bc2196 Merge pull request #1355 from scm-manager/bugfix/fix_not_found_on_empty_hg_repo 
Fix not found error when reading empty hg repository
 2020-09-30 09:22:02 +02:00
René Pfeuffer
a6af1d0e34 Fix not found error when reading empty hg repository 2020-09-29 10:43:41 +02:00
Florian Scholdei
4762a491ad Small typo 2020-09-29 08:45:14 +02:00
René Pfeuffer
53f871ac39 Merge pull request #1353 from scm-manager/snyk-upgrade-c09efccc40e067d1d02bc6c3502b8908 
[Snyk] Upgrade org.assertj:assertj-core from 3.17.1 to 3.17.2
 2020-09-28 11:18:03 +02:00
René Pfeuffer
b0ef53c97b Merge pull request #1352 from scm-manager/snyk-upgrade-613b6f6086cf814182e7bfd16f5817f9 
[Snyk] Upgrade org.mockito:mockito-junit-jupiter from 3.5.9 to 3.5.10
 2020-09-28 10:10:35 +02:00
snyk-bot
57a08c9323 fix: upgrade org.assertj:assertj-core from 3.17.1 to 3.17.2 
Snyk has created this PR to upgrade org.assertj:assertj-core from 3.17.1 to 3.17.2.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.assertj/assertj-core/

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
 2020-09-28 01:00:07 +00:00
snyk-bot
038e05f5e0 fix: upgrade org.mockito:mockito-junit-jupiter from 3.5.9 to 3.5.10 
Snyk has created this PR to upgrade org.mockito:mockito-junit-jupiter from 3.5.9 to 3.5.10.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter/

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
 2020-09-26 01:00:26 +00:00
CES Marvin
4e7d62ce2f prepare for next development iteration 2020-09-25 10:05:04 +00:00
CES Marvin
e2f8566a8b release version 2.6.0 2.6.0 2020-09-25 09:25:13 +00:00
Eduard Heimbuch
b498dba261 Adjust changelog for release 2.6.0 2020-09-25 11:15:44 +02:00
René Pfeuffer
a86d42d78c Merge pull request #1351 from scm-manager/bugfix/only_template_default_commit_message 
fix message templating
 2020-09-25 11:04:30 +02:00
René Pfeuffer
e1ec5ef5c6 Update CHANGELOG.md 2020-09-25 11:02:37 +02:00
Eduard Heimbuch
a39abcdbe9 enhance mergeCommandBuilder API with setMessage to avoid templating commit messages 2020-09-25 10:30:45 +02:00
Eduard Heimbuch
f0db57faed update CHANGELOG.md 2020-09-25 10:05:33 +02:00
Eduard Heimbuch
f5060f9d16 fix message templating 2020-09-25 09:46:52 +02:00
René Pfeuffer
9f8f26e055 Merge pull request #1342 from scm-manager/feature/admin_info 
Feature/admin info
 2020-09-24 12:32:24 +02:00
Eduard Heimbuch
0f7707d539 fix unit test 2020-09-24 12:25:36 +02:00
René Pfeuffer
2626bd118a Use configured url as cache key 
Doing so, we will ignore the cached result every time a new feed url is
specified. So a change of the url will be taken into account immediately
 2020-09-24 11:57:54 +02:00
René Pfeuffer
ebd48413b8 Catch all exceptions 
Otherwise sax exceptions will escape this catch and we cannot cache the
result which leads to requests every time the update info is requested.
 2020-09-24 11:57:54 +02:00
René Pfeuffer
1bf70fd655 Offer update info link only, when feed url is specified 2020-09-24 11:57:54 +02:00
René Pfeuffer
6a80cce87a Make request for feed more resilient 
This commit tackles the following issue:
When the release feed takes a long time to read (however), the former
solution would propagete requests to the SCM-Manager to multiple
requests of the specified feed url. This can, in the worst case, cause
a drain of resources like request threads.

We fix this with two actions:
1. We wrap the request itself in an executor with a timeout,
2. We only trigger one request at a time, so that we will not flood
   the feed server with requests.
 2020-09-24 11:57:33 +02:00
Eduard Heimbuch
23581e780d fix review findings 2020-09-24 10:59:27 +02:00
Eduard Heimbuch
b424bc8ff0 Merge branch 'develop' into feature/admin_info 2020-09-24 10:41:17 +02:00
Eduard Heimbuch
804a6498a7 fix review findings 2020-09-24 10:38:40 +02:00
Florian Scholdei
b72dc36f3e Fix TagDetail title on mobile view 2020-09-24 09:52:54 +02:00
eheimbuch
c1c6b7ae74 Merge pull request #1344 from scm-manager/bugfix/correct_revision_for_tags_in_hooks 
Determine correct revision for tags in hooks
 2020-09-24 09:15:44 +02:00
René Pfeuffer
cd9da7e658 Determine correct revision for tags in hooks 
The former code only resolved the object id of the tags, when those were
annotated tags (for "simple" tags the code worked fine). Now we even can
handle nested tags (tags that reference other tags).
 2020-09-24 08:28:52 +02:00