Merge branch '24998-fix-typo-gitlab-config-file' into 'master'

Fix typo in Gitlab application config file Closes #24998 See merge request !9702

Merge branch '24998-fix-typo-gitlab-config-file' into 'master'
35427246 · Rémy Coutable · 93e50f31 · 8a57c4fc · 35427246 · 35427246
Commit 35427246 authored Mar 06, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

24998-fix-typo-gitlab-config-file.yml changelogs/unreleased/24998-fix-typo-gitlab-config-file.yml +4 -0

gitlab.yml.example config/gitlab.yml.example +1 -1

No files found.
--- a/changelogs/unreleased/24998-fix-typo-gitlab-config-file.yml
+++ b/changelogs/unreleased/24998-fix-typo-gitlab-config-file.yml
+---
+title: Fix typo in Gitlab config file
+merge_request: 9702
+author: medied
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -588,7 +588,7 @@ test:
      new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new"
    jira:
      title: "JIRA"
-      url: https://sample_company.atlasian.net
+      url: https://sample_company.atlassian.net
      project_key: PROJECT
  ldap:
    enabled: false