Commit 98c4b996 authored by Jeremie Bresson's avatar Jeremie Bresson
Browse files

Merge branch 'main' into 6.x

And apply replacement:
* "javax.ws.rs.core" => "jakarta.ws.rs.core"

TestImportExportApi: change the file length expectation
No related merge requests found
Showing with 9 additions and 5 deletions
+9 -5
{ {
"id": 46, "id": 46,
"iid": 11,
"project_id": 1,
"status": "success", "status": "success",
"web_url": "http://3cb4fb3163d4/gitlab4j/test-project/pipelines/66", "ref": "main",
"ref": "master",
"sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
"before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", "before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
"tag": false, "tag": false,
"yaml_errors": "Included file `.gitlab-ci.yml` does not have valid YAML syntax!",
"user": { "user": {
"name": "Administrator", "name": "Administrator",
"username": "root", "username": "root",
...@@ -17,7 +19,7 @@ ...@@ -17,7 +19,7 @@
"created_at": "2016-08-11T11:28:34.085Z", "created_at": "2016-08-11T11:28:34.085Z",
"updated_at": "2016-08-11T11:32:35.169Z", "updated_at": "2016-08-11T11:32:35.169Z",
"finished_at": "2016-08-11T11:32:35.145Z", "finished_at": "2016-08-11T11:32:35.145Z",
"coverage": "30.0", "duration": 123,
"queued_duration": 0.010, "queued_duration": 0.010,
"detailed_status": { "detailed_status": {
"icon": "status_pending", "icon": "status_pending",
...@@ -28,5 +30,7 @@ ...@@ -28,5 +30,7 @@
"has_details": true, "has_details": true,
"details_path": "/gitlab4j/test-project/pipelines/66", "details_path": "/gitlab4j/test-project/pipelines/66",
"favicon": "/assets/ci_favicons/favicon_status_pending-5bdf338420e5221ca24353b6bff1c9367189588750632e9a871b7af09ff6a2ae.png" "favicon": "/assets/ci_favicons/favicon_status_pending-5bdf338420e5221ca24353b6bff1c9367189588750632e9a871b7af09ff6a2ae.png"
} },
"coverage": "30.0",
"web_url": "https://example.com/foo/bar/pipelines/46"
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"basename": "home", "basename": "home",
"data": "hello\n\nand bye\n\nend", "data": "hello\n\nand bye\n\nend",
"filename": "home.md", "filename": "home.md",
"id": 123, "id": "a0b24fa71d6d8cef7393e877c608496f91ded0f6",
"ref": "master", "ref": "master",
"startline": 5, "startline": 5,
"project_id": 6 "project_id": 6
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment