otcbot[bot]
commented
1 year ago I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.
BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.
In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.
Following is the patch remainder:
diff a/umn/source/conf.py b/umn/source/conf.py (rejected hunks)
@@ -26,6 +26,9 @@ otcdocs_auto_version = False
project = 'Object Storage Service'
otcdocs_repo_name = 'docs/object-storage-service'
+# Those variables are required for edit/bug links
+otcdocs_git_fqdn = 'gitea.eco.tsi-dev.otc-service.com'
+otcdocs_git_type = 'gitea'
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -72,11 +75,12 @@ show_authors = False
html_theme = 'otcdocs'
# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
+# further. For a list of options available for each theme, see the
# documentation.
html_theme_options = {
- 'disable_search': True,
- 'site_name': 'Internal Documentation Portal'
+ "disable_search": "True",
+ "site_name": "Internal Documentation Portal",
+ "logo_url": "https://docs-int.otc-service.com",
}
# The name for this set of Sphinx documents. If None, it defaults to
This is an automatically created Pull Request for changes to object-storage-service-umn to promote changes down the pipeline to Production environment.
The original change can be found under https://gitea.eco.tsi-dev.otc-service.com/docs/object-storage-service/pulls/17.
There were patch conflicts, please review original patch file.