Profile settings refers to Gravatar even though Gravatar is not enabled

In GitLab 2.6.1, the user's profile settings page (/profile) says the following, even though Gravatar support is turned off:

You can change your avatar here or remove the current avatar to revert to gravatar.com

This of course is purely cosmetic, but the Gravatar part should also disappear when disabling Gravatar support.

Added frontend label

Workaround (works for me): add enabled: false to gitlab.yml

....
  ## Gravatar
  ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
  gravatar:
    enabled: false
    # gravatar urls: possible placeholders: %{hash} %{size} %{email}
    plain_url:      # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon

....

then restart unicorn.

In case of omnibus installations, this file get overwritten by gitlab-ctl reconfigure runs. So the change should be applied after reconfigure run.

Reason for this issue is probably here, this view refers not to the new admin setting, but to the old gitlab.yml config file.

We see this issue on 8.5.11 CE omnibus. But couple of days ago I reproduced it with DK on master. Steps:

• Disable gravatar in admin settings
• Take a look to the profile view

You will see something like:

Added ~12980 ~113220 labels

mentioned in merge request !3988 (merged)

mentioned in issue #14939 (closed)

Milestone changed to 8.8

Status changed to closed by commit 585f5cfa

mentioned in commit 585f5cfa

Mentioned in commit pfjason/gitlab-ce@585f5cfa

mentioned in commit test-nick/gitlab-ce@83bee600