diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-06 18:13:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-06 18:13:45 +0000 |
| commit | 354272460a69ef1231a96959f764f8a5b761461c (patch) | |
| tree | cc6ce389e9eee34f28aecffae32ea29f59fb90e8 | |
| parent | 93e50f312352a9115cbd1e55f6eddd6d21061c0f (diff) | |
| parent | 8a57c4fc5531cccec7f964d6b7a31e5bde9b5a3c (diff) | |
| download | gitlab-ce-354272460a69ef1231a96959f764f8a5b761461c.tar.gz | |
Merge branch '24998-fix-typo-gitlab-config-file' into 'master'
Fix typo in Gitlab application config file
Closes #24998
See merge request !9702
| -rw-r--r-- | changelogs/unreleased/24998-fix-typo-gitlab-config-file.yml | 4 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/24998-fix-typo-gitlab-config-file.yml b/changelogs/unreleased/24998-fix-typo-gitlab-config-file.yml new file mode 100644 index 00000000000..3b90466e3af --- /dev/null +++ b/changelogs/unreleased/24998-fix-typo-gitlab-config-file.yml @@ -0,0 +1,4 @@ +--- +title: Fix typo in Gitlab config file +merge_request: 9702 +author: medied diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c9bd6b930d6..be34a4000fa 100644 --- 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 |