Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e41c3f69
Commit
e41c3f69
authored
Dec 08, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct previous stable branch used in 8.14 to 8.15 update guide
[ci skip]
parent
e7b045ea
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
doc/update/8.14-to-8.15.md
doc/update/8.14-to-8.15.md
+3
-3
No files found.
doc/update/8.14-to-8.15.md
View file @
e41c3f69
...
...
@@ -113,7 +113,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
There are new configuration options available for
[
`gitlab.yml`
](
config/gitlab.yml.example
)
. View them with the command below and apply them manually to your current
`gitlab.yml`
:
```
sh
git diff origin/8-1
3
-stable:config/gitlab.yml.example origin/8-15-stable:config/gitlab.yml.example
git diff origin/8-1
4
-stable:config/gitlab.yml.example origin/8-15-stable:config/gitlab.yml.example
```
#### Git configuration
...
...
@@ -131,10 +131,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes:
```
sh
# For HTTPS configurations
git diff origin/8-1
3
-stable:lib/support/nginx/gitlab-ssl origin/8-15-stable:lib/support/nginx/gitlab-ssl
git diff origin/8-1
4
-stable:lib/support/nginx/gitlab-ssl origin/8-15-stable:lib/support/nginx/gitlab-ssl
# For HTTP configurations
git diff origin/8-1
3
-stable:lib/support/nginx/gitlab origin/8-15-stable:lib/support/nginx/gitlab
git diff origin/8-1
4
-stable:lib/support/nginx/gitlab origin/8-15-stable:lib/support/nginx/gitlab
```
If you are using Apache instead of NGINX please see the updated [Apache templates].
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment