summaryrefslogtreecommitdiff
path: root/lib/api/helpers
diff options
context:
space:
mode:
authorDietrich Stein <dstein@gitlab.com>2019-07-17 13:10:23 -0400
committerDietrich Stein <dstein@gitlab.com>2019-07-17 13:10:23 -0400
commitc6a2c8f673da4e4e32b15a5b563b25b474bcc263 (patch)
tree739819c3f9b61b35e0097835ce67fab6dc50e218 /lib/api/helpers
parent9bd4025b21f3ba65cde7755457111db799ef6744 (diff)
parent2860cfaaff0a435792081b72a5f97de85e0d4f70 (diff)
downloadgitlab-ce-ds-charts-whitespace.tar.gz
Merge branch 'master' into ds-charts-whitespaceds-charts-whitespace
Diffstat (limited to 'lib/api/helpers')
-rw-r--r--lib/api/helpers/projects_helpers.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index 0e21a7a66fd..833e3b9ebaf 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb
@@ -42,7 +42,6 @@ module API
optional :printing_merge_request_link_enabled, type: Boolean, desc: 'Show link to create/view merge request when pushing from the command line'
optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests'
optional :initialize_with_readme, type: Boolean, desc: "Initialize a project with a README.md"
- optional :external_authorization_classification_label, type: String, desc: 'The classification label for the project'
optional :ci_default_git_depth, type: Integer, desc: 'Default number of revisions for shallow cloning'
optional :auto_devops_enabled, type: Boolean, desc: 'Flag indication if Auto DevOps is enabled'
optional :auto_devops_deploy_strategy, type: String, values: %w(continuous manual timed_incremental), desc: 'Auto Deploy strategy'
@@ -94,7 +93,6 @@ module API
:visibility,
:wiki_access_level,
:avatar,
- :external_authorization_classification_label,
# TODO: remove in API v5, replaced by *_access_level
:issues_enabled,
@@ -105,6 +103,9 @@ module API
:snippets_enabled
]
end
+
+ def filter_attributes_using_license!(attrs)
+ end
end
end
end