summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-09 18:36:05 -0700
committerRobert Speicher <rspeicher@gmail.com>2015-09-09 18:36:05 -0700
commit25f684e81d27fff537d71ba38b7106f2fdc5e701 (patch)
tree47fe62b399e6575184f5af0c2f8048608666fb43
parenta0359fbd77c0a4fcbac30c15544b1a3432bfe8bf (diff)
parent19cba632d846c9fcf736133eb62db1b8905c5009 (diff)
downloadgitlab-ce-25f684e81d27fff537d71ba38b7106f2fdc5e701.tar.gz
Merge pull request #9617 from dukex/patch-1
Fix 7.14 stable branch name in upgrade docs [ci skip]
-rw-r--r--doc/update/6.x-or-7.x-to-7.14.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/6.x-or-7.x-to-7.14.md b/doc/update/6.x-or-7.x-to-7.14.md
index 5bc1f84270a..b34fb12da6f 100644
--- a/doc/update/6.x-or-7.x-to-7.14.md
+++ b/doc/update/6.x-or-7.x-to-7.14.md
@@ -162,7 +162,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
TIP: to see what changed in `gitlab.yml.example` in this release use next command:
```
-git diff 6-0-stable:config/gitlab.yml.example 7.14-stable:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-14-stable:config/gitlab.yml.example
```
* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-14-stable/config/gitlab.yml.example but with your settings.