Deprecate brand title text option, logo now contains text

client/src/components/Masthead/QuotaMeter.vue

@@ -80,7 +80,7 @@ export default {
 @import "theme/blue.scss";
 
 .quota-meter {
-    position: relative;
+    position: absolute;
     right: 0.8rem;
     width: 100px;
     height: 100%;

client/src/entry/analysis/App.vue

@@ -5,7 +5,6 @@
             <Masthead
                 v-if="showMasthead"
                 id="masthead"
-                :display-galaxy-brand="config.display_galaxy_brand"
                 :brand="config.brand"
                 :logo-url="config.logo_url"
                 :logo-src="config.logo_src"

doc/source/admin/galaxy_options.rst

@@ -1902,7 +1902,8 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 :Description:
-    Display the "Galaxy" text in the masthead.
+    This option has been deprecated, use the `logo_src` instead to
+    change the default logo including the galaxy brand title.
 :Default: ``true``
 :Type: bool
 

lib/galaxy/config/sample/galaxy.yml.sample

@@ -1071,7 +1071,8 @@ galaxy:
   # Append "{brand}" text to the masthead.
   #brand: null
 
-  # Display the "Galaxy" text in the masthead.
+  # This option has been deprecated, use the `logo_src` instead to
+  # change the default logo including the galaxy brand title.
   #display_galaxy_brand: true
 
   # Format string used when showing date and time information. The
@@ -2430,8 +2431,8 @@ galaxy:
   #    galaxy.set_job_metadata: galaxy.external
 
   # Offload long-running tasks to a Celery task queue. Activate this
-  # only if you have setup a Celery worker for Galaxy in the gravity section.
-  # This is a beta feature that is actively being worked on.
+  # only if you have setup a Celery worker for Galaxy. For details, see
+  # https://docs.galaxyproject.org/en/master/admin/production.html
   #enable_celery_tasks: false
 
   # Allow disabling pbkdf2 hashing of passwords for legacy situations.

lib/galaxy/config/schemas/config_schema.yml

@@ -1368,7 +1368,8 @@ mapping:
         required: false
         per_host: true
         desc: |
-          Display the "Galaxy" text in the masthead.
+          This option has been deprecated, use the `logo_src` instead to change the
+          default logo including the galaxy brand title.
 
       pretty_datetime_format:
         type: str

lib/galaxy/managers/configuration.py

@@ -116,7 +116,6 @@ class ConfigSerializer(base.ModelSerializer):
             # TODO: this is available from user data, remove
             "is_admin_user": lambda *a, **c: False,
             "brand": _use_config,
-            "display_galaxy_brand": _use_config,
             "logo_url": _use_config,
             "logo_src": _use_config,
             "logo_src_secondary": _use_config,