Commit f5bb945a authored by Stan Hu's avatar Stan Hu

Merge branch 'sh-add-sign-in-count-external-validation' into 'master'

Add sign-in count to external pipeline validation

See merge request gitlab-org/gitlab!70668
parents 55c59d85 348e56d3
...@@ -76,7 +76,8 @@ required number of seconds. ...@@ -76,7 +76,8 @@ required number of seconds.
"email": { "type": "string" }, "email": { "type": "string" },
"created_at": { "type": ["string", "null"], "format": "date-time" }, "created_at": { "type": ["string", "null"], "format": "date-time" },
"current_sign_in_ip": { "type": ["string", "null"] }, "current_sign_in_ip": { "type": ["string", "null"] },
"last_sign_in_ip": { "type": ["string", "null"] } "last_sign_in_ip": { "type": ["string", "null"] },
"sign_in_count": { "type": "integer" }
} }
}, },
"pipeline": { "pipeline": {
......
...@@ -91,7 +91,8 @@ module Gitlab ...@@ -91,7 +91,8 @@ module Gitlab
email: current_user.email, email: current_user.email,
created_at: current_user.created_at&.iso8601, created_at: current_user.created_at&.iso8601,
current_sign_in_ip: current_user.current_sign_in_ip, current_sign_in_ip: current_user.current_sign_in_ip,
last_sign_in_ip: current_user.last_sign_in_ip last_sign_in_ip: current_user.last_sign_in_ip,
sign_in_count: current_user.sign_in_count
}, },
pipeline: { pipeline: {
sha: pipeline.sha, sha: pipeline.sha,
......
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
"email": { "type": "string" }, "email": { "type": "string" },
"created_at": { "type": ["string", "null"], "format": "date-time" }, "created_at": { "type": ["string", "null"], "format": "date-time" },
"current_sign_in_ip": { "type": ["string", "null"] }, "current_sign_in_ip": { "type": ["string", "null"] },
"last_sign_in_ip": { "type": ["string", "null"] } "last_sign_in_ip": { "type": ["string", "null"] },
"sign_in_count": { "type": "integer" }
} }
}, },
"pipeline": { "pipeline": {
......
Markdown is supported
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