Merge branch 'master' into update-todo-in-uiupdate-todo-in-ui

* master: (435 commits)
  Change occurrence of Sidekiq::Testing.inline!
  Fix order-dependent spec failure in appearance_spec.rb
  Put a failed example from appearance_spec in quarantine
  Cache PerformanceBar.allowed_user_ids list locally and in Redis
  Add Grafana to Admin > Monitoring menu when enabled
  Add changelog entry
  Add salesforce logo
  Move error_tracking_frontend specs to Jest
  Only save Peek session in Redis when Peek is enabled
  Migrate markdown header_spec.js to Jest
  Fix golint command in Go guide doc to be recursive
  Move images to their own dirs
  Gitlab -> GitLab
  Re-align CE and EE API docs
  Rename Release groups in issue_workflow.md
  Update api docs to finish aligning EE and CE docs
  Update locale.pot
  Update TODO: allow_collaboration column renaming
  Show upcoming status for releases
  Rebased and squashed commits
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md
index 15f093bb62d..b45966fa920 100644
--- a/doc/administration/auth/ldap-ee.md
+++ b/doc/administration/auth/ldap-ee.md
@@ -185,7 +185,7 @@ group, as opposed to the full DN.
 
 ## Global group memberships lock
 
-"Lock memberships to LDAP synchronization" setting allows instance administrators 
+"Lock memberships to LDAP synchronization" setting allows instance administrators
 to lock down user abilities to invite new members to a group. When enabled following happens:
 
 1. Only administrator can manage memberships of any group including access levels.
@@ -198,14 +198,14 @@ to lock down user abilities to invite new members to a group. When enabled follo
 
 NOTE: **Note:**
 These are cron formatted values. You can use a crontab generator to create
-these values, for example http://www.crontabgenerator.com/.
+these values, for example <http://www.crontabgenerator.com/>.
 
 By default, GitLab will run a worker once per day at 01:30 a.m. server time to
 check and update GitLab users against LDAP.
 
 You can manually configure LDAP user sync times by setting the
 following configuration values. The example below shows how to set LDAP user
-sync to run once every 12 hours at the top of the hour. 
+sync to run once every 12 hours at the top of the hour.
 
 **Omnibus installations**
 
@@ -233,7 +233,7 @@ sync to run once every 12 hours at the top of the hour.
 
 NOTE: **Note:**
 These are cron formatted values. You can use a crontab generator to create
-these values, for example http://www.crontabgenerator.com/.
+these values, for example <http://www.crontabgenerator.com/>.
 
 By default, GitLab will run a group sync process every hour, on the hour.
 
@@ -245,8 +245,8 @@ for installations with a large number of LDAP users. Please review the
 your installation compares before proceeding.
 
 You can manually configure LDAP group sync times by setting the
-following configuration values. The example below shows how to set group 
-sync to run once every 2 hours at the top of the hour. 
+following configuration values. The example below shows how to set group
+sync to run once every 2 hours at the top of the hour.
 
 **Omnibus installations**