Commit f2e77c33 authored by Stan Hu's avatar Stan Hu

Merge branch 'id-fix-warnings-for-jira-projects-resolver' into 'master'

Fix warnings for jira_projects_resolver

See merge request gitlab-org/gitlab!44445
parents 8117dcd8 faec75e9
...@@ -22,7 +22,7 @@ module Resolvers ...@@ -22,7 +22,7 @@ module Resolvers
projects_array, projects_array,
# override default max_page_size to whatever the size of the response is, # override default max_page_size to whatever the size of the response is,
# see https://gitlab.com/gitlab-org/gitlab/-/issues/231394 # see https://gitlab.com/gitlab-org/gitlab/-/issues/231394
args.merge({ max_page_size: projects_array.size }) **args.merge({ max_page_size: projects_array.size })
) )
else else
raise Gitlab::Graphql::Errors::BaseError, response.message raise Gitlab::Graphql::Errors::BaseError, response.message
......
...@@ -60,9 +60,9 @@ module Gitlab ...@@ -60,9 +60,9 @@ module Gitlab
# name - The name of the feature flag, e.g. `my_feature`. # name - The name of the feature flag, e.g. `my_feature`.
# args - Any additional arguments to pass to `Feature.enabled?`. This allows # args - Any additional arguments to pass to `Feature.enabled?`. This allows
# you to check if a flag is enabled for a particular user. # you to check if a flag is enabled for a particular user.
def push_frontend_feature_flag(name, *args) def push_frontend_feature_flag(name, *args, **kwargs)
var_name = name.to_s.camelize(:lower) var_name = name.to_s.camelize(:lower)
enabled = Feature.enabled?(name, *args) enabled = Feature.enabled?(name, *args, **kwargs)
# Here the `true` argument signals gon that the value should be merged # Here the `true` argument signals gon that the value should be merged
# into any existing ones, instead of overwriting them. This allows you to # into any existing ones, instead of overwriting them. This allows you to
......
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