diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 12:06:40 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 12:06:40 +0000 |
commit | 0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (patch) | |
tree | 9ff7dd7b21a3f9642a8fbb45c922f71a433faf02 /config | |
parent | a048261403ea7e12992ccffe704f0779235712d7 (diff) | |
download | gitlab-ce-0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/hamlit.rb | 16 | ||||
-rw-r--r-- | config/knative/api_groups.yml | 11 | ||||
-rw-r--r-- | config/knative/api_resources.yml | 70 |
3 files changed, 12 insertions, 85 deletions
diff --git a/config/initializers/hamlit.rb b/config/initializers/hamlit.rb index 51dbffeda05..b5bcae4bbfc 100644 --- a/config/initializers/hamlit.rb +++ b/config/initializers/hamlit.rb @@ -1,18 +1,4 @@ -module Hamlit - class TemplateHandler - def call(template) - Engine.new( - generator: Temple::Generators::RailsOutputBuffer, - attr_quote: '"' - ).call(template.source) - end - end -end - -ActionView::Template.register_template_handler( - :haml, - Hamlit::TemplateHandler.new -) +Hamlit::RailsTemplate.set_options(attr_quote: '"') Hamlit::Filters.remove_filter('coffee') Hamlit::Filters.remove_filter('coffeescript') diff --git a/config/knative/api_groups.yml b/config/knative/api_groups.yml new file mode 100644 index 00000000000..4697086eb5a --- /dev/null +++ b/config/knative/api_groups.yml @@ -0,0 +1,11 @@ +--- + +- networking.istio.io +- rbac.istio.io +- authentication.istio.io +- config.istio.io + +- networking.internal.knative.dev +- serving.knative.dev +- caching.internal.knative.dev +- autoscaling.internal.knative.dev
\ No newline at end of file diff --git a/config/knative/api_resources.yml b/config/knative/api_resources.yml deleted file mode 100644 index 095f44ed799..00000000000 --- a/config/knative/api_resources.yml +++ /dev/null @@ -1,70 +0,0 @@ ---- - -- meshpolicies.authentication.istio.io -- policies.authentication.istio.io -- adapters.config.istio.io -- apikeys.config.istio.io -- attributemanifests.config.istio.io -- authorizations.config.istio.io -- bypasses.config.istio.io -- podautoscalers.autoscaling.internal.knative.dev -- builds.build.knative.dev -- buildtemplates.build.knative.dev -- clusterbuildtemplates.build.knative.dev -- images.caching.internal.knative.dev -- certificates.networking.internal.knative.dev -- clusteringresses.networking.internal.knative.dev -- serverlessservices.networking.internal.knative.dev -- configurations.serving.knative.dev -- revisions.serving.knative.dev -- routes.serving.knative.dev -- services.serving.knative.dev -- checknothings.config.istio.io -- circonuses.config.istio.io -- deniers.config.istio.io -- edges.config.istio.io -- fluentds.config.istio.io -- handlers.config.istio.io -- httpapispecbindings.config.istio.io -- httpapispecs.config.istio.io -- instances.config.istio.io -- kubernetesenvs.config.istio.io -- kuberneteses.config.istio.io -- listcheckers.config.istio.io -- listentries.config.istio.io -- logentries.config.istio.io -- memquotas.config.istio.io -- metrics.config.istio.io -- noops.config.istio.io -- opas.config.istio.io -- prometheuses.config.istio.io -- quotas.config.istio.io -- quotaspecbindings.config.istio.io -- quotaspecs.config.istio.io -- rbacs.config.istio.io -- redisquotas.config.istio.io -- reportnothings.config.istio.io -- rules.config.istio.io -- servicecontrolreports.config.istio.io -- servicecontrols.config.istio.io -- signalfxs.config.istio.io -- solarwindses.config.istio.io -- stackdrivers.config.istio.io -- statsds.config.istio.io -- stdios.config.istio.io -- templates.config.istio.io -- tracespans.config.istio.io -- destinationrules.networking.istio.io -- envoyfilters.networking.istio.io -- gateways.networking.istio.io -- serviceentries.networking.istio.io -- virtualservices.networking.istio.io -- rbacconfigs.rbac.istio.io -- servicerolebindings.rbac.istio.io -- serviceroles.rbac.istio.io -- cloudwatches.config.istio.io -- clusterrbacconfigs.rbac.istio.io -- dogstatsds.config.istio.io -- ingresses.networking.internal.knative.dev -- sidecars.networking.istio.io -- zipkins.config.istio.io |