Skip to content

G
gitlab-ce
Commit 2501495a authored by James Fargher's avatar James Fargher
Browse files
Options

Merge branch 'ld-fix-deprecation-milestones' into 'master' 

Fix deprecation.milestone for timeframe arguments

See merge request gitlab-org/gitlab!45228
parents 038e238b 8dabb9c8
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
app/graphql/resolvers/concerns/time_frame_arguments.rb
View file @ 2501495a
...@@ -9,12 +9,12 @@ module TimeFrameArguments ...@@ -9,12 +9,12 @@ module TimeFrameArguments
argument :start_date, Types::TimeType, argument :start_date, Types::TimeType,
required: false, required: false,
description: OVERLAPPING_TIMEFRAME_DESC, description: OVERLAPPING_TIMEFRAME_DESC,
deprecated: { reason: 'Use timeframe.start', milestone: '14.0' } deprecated: { reason: 'Use timeframe.start', milestone: '13.5' }
argument :end_date, Types::TimeType, argument :end_date, Types::TimeType,
required: false, required: false,
description: OVERLAPPING_TIMEFRAME_DESC, description: OVERLAPPING_TIMEFRAME_DESC,
deprecated: { reason: 'Use timeframe.end', milestone: '14.0' } deprecated: { reason: 'Use timeframe.end', milestone: '13.5' }
argument :timeframe, Types::TimeframeInputType, argument :timeframe, Types::TimeframeInputType,
required: false, required: false,
......
doc/api/graphql/reference/gitlab_schema.graphql
View file @ 2501495a
...@@ -1228,7 +1228,7 @@ type BoardEpic implements CurrentUserTodos & Noteable { ...@@ -1228,7 +1228,7 @@ type BoardEpic implements CurrentUserTodos & Noteable {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -1279,7 +1279,7 @@ type BoardEpic implements CurrentUserTodos & Noteable { ...@@ -1279,7 +1279,7 @@ type BoardEpic implements CurrentUserTodos & Noteable {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
...@@ -6075,7 +6075,7 @@ type Epic implements CurrentUserTodos & Noteable { ...@@ -6075,7 +6075,7 @@ type Epic implements CurrentUserTodos & Noteable {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -6126,7 +6126,7 @@ type Epic implements CurrentUserTodos & Noteable { ...@@ -6126,7 +6126,7 @@ type Epic implements CurrentUserTodos & Noteable {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
...@@ -7569,7 +7569,7 @@ type Group { ...@@ -7569,7 +7569,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -7610,7 +7610,7 @@ type Group { ...@@ -7610,7 +7610,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
...@@ -7647,7 +7647,7 @@ type Group { ...@@ -7647,7 +7647,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -7698,7 +7698,7 @@ type Group { ...@@ -7698,7 +7698,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
...@@ -7915,7 +7915,7 @@ type Group { ...@@ -7915,7 +7915,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -7946,7 +7946,7 @@ type Group { ...@@ -7946,7 +7946,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
...@@ -8123,7 +8123,7 @@ type Group { ...@@ -8123,7 +8123,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -8154,7 +8154,7 @@ type Group { ...@@ -8154,7 +8154,7 @@ type Group {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
...@@ -13989,7 +13989,7 @@ type Project { ...@@ -13989,7 +13989,7 @@ type Project {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -14020,7 +14020,7 @@ type Project { ...@@ -14020,7 +14020,7 @@ type Project {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
...@@ -14249,7 +14249,7 @@ type Project { ...@@ -14249,7 +14249,7 @@ type Project {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use timeframe.end date is provided, both must be present). Deprecated in 13.5: Use timeframe.end
""" """
endDate: Time endDate: Time
...@@ -14280,7 +14280,7 @@ type Project { ...@@ -14280,7 +14280,7 @@ type Project {
""" """
List items overlapping a time frame defined by startDate..endDate (if one List items overlapping a time frame defined by startDate..endDate (if one
date is provided, both must be present). Deprecated in 14.0: Use date is provided, both must be present). Deprecated in 13.5: Use
timeframe.start timeframe.start
""" """
startDate: Time startDate: Time
......
doc/api/graphql/reference/gitlab_schema.json
View file @ 2501495a
...@@ -3191,7 +3191,7 @@ ...@@ -3191,7 +3191,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -3201,7 +3201,7 @@ ...@@ -3201,7 +3201,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -16726,7 +16726,7 @@ ...@@ -16726,7 +16726,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -16736,7 +16736,7 @@ ...@@ -16736,7 +16736,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -20810,7 +20810,7 @@ ...@@ -20810,7 +20810,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -20820,7 +20820,7 @@ ...@@ -20820,7 +20820,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -20959,7 +20959,7 @@ ...@@ -20959,7 +20959,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -20969,7 +20969,7 @@ ...@@ -20969,7 +20969,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -21600,7 +21600,7 @@ ...@@ -21600,7 +21600,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -21610,7 +21610,7 @@ ...@@ -21610,7 +21610,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -22056,7 +22056,7 @@ ...@@ -22056,7 +22056,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -22066,7 +22066,7 @@ ...@@ -22066,7 +22066,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -40745,7 +40745,7 @@ ...@@ -40745,7 +40745,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -40755,7 +40755,7 @@ ...@@ -40755,7 +40755,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -41327,7 +41327,7 @@ ...@@ -41327,7 +41327,7 @@
"args": [ "args": [
{ {
"name": "startDate", "name": "startDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.start", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.start",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
...@@ -41337,7 +41337,7 @@ ...@@ -41337,7 +41337,7 @@
}, },
{ {
"name": "endDate", "name": "endDate",
"description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 14.0: Use timeframe.end", "description": "List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present). Deprecated in 13.5: Use timeframe.end",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "Time", "name": "Time",
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7