Skip to content

Commit

Permalink
commit 7acaed3
Browse files Browse the repository at this point in the history
Merge: 486453b 3f2e1ce
Author: Prarup Gurung <grgprarup@users.noreply.github.com>
Date:   Wed Feb 1 17:12:05 2023 +0545

    Merge pull request #5489 from owncloud/remove-core-bug-demonstration-scenarios-master

    [full-ci] [tests-only] Removed core bug demonstration scenarios
  • Loading branch information
grgprarup committed Feb 1, 2023
1 parent 543f1da commit d1f6647
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions helpers/extended_vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ variables:
description: ""
do_ignore: true
- rawname: MICRO_LOG_LEVEL
path: ocis-pkg/log/log.go:31
path: ocis-pkg/log/log.go:35
foundincode: true
name: MICRO_LOG_LEVEL
type: ""
default_value: ""
description: ""
do_ignore: false
- rawname: MICRO_LOG_LEVEL
path: ocis-pkg/log/log.go:35
path: ocis-pkg/log/log.go:31
foundincode: true
name: MICRO_LOG_LEVEL
type: ""
Expand Down
10 changes: 5 additions & 5 deletions services/_includes/adoc/global_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
The default role assignments the demo users should be setup.
Flag to enable or disable the creation of the demo users.

a| `LDAP_BIND_DN`

Expand Down Expand Up @@ -535,7 +535,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[Authorization Origin Content-Type Accept X-Requested-With] ++
++[Origin Accept Content-Type Depth Authorization Ocs-Apirequest If-None-Match If-Match Destination Overwrite X-Request-Id X-Requested-With Tus-Resumable Tus-Checksum-Algorithm Upload-Concat Upload-Length Upload-Metadata Upload-Defer-Length Upload-Expires Upload-Checksum Upload-Offset X-HTTP-Method-Override] ++

a| [subs=-attributes]
A comma-separated list of allowed CORS headers. See following chapter for more details: *Access-Control-Request-Headers* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers.
Expand All @@ -552,7 +552,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[GET POST PUT PATCH DELETE OPTIONS] ++
++[OPTIONS HEAD GET PUT POST DELETE MKCOL PROPFIND PROPPATCH MOVE COPY REPORT SEARCH] ++

a| [subs=-attributes]
A comma-separated list of allowed CORS methods. See following chapter for more details: *Access-Control-Request-Method* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Method
Expand Down Expand Up @@ -1073,7 +1073,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
Machine auth API key used to validate internal requests necessary for the access to resources from other services.
The machine auth API key used to validate internal requests necessary to access resources from other services.

a| `OCIS_OIDC_ISSUER`

Expand Down Expand Up @@ -1334,7 +1334,7 @@ a| [subs=-attributes]
++https://localhost:9200 ++

a| [subs=-attributes]
The identity provider value to set in the userids of the CS3 user objects for users returned by this user provider.
The public facing URL of the oCIS frontend.

a| `REVA_GATEWAY`

Expand Down

0 comments on commit d1f6647

Please sign in to comment.