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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
22ddd1f8
Commit
22ddd1f8
authored
Nov 20, 2018
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-30' into 'master'
Update 11.3-to-11.4.md See merge request gitlab-org/gitlab-ce!23142
parents
b11cd17b
f826f907
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
doc/update/11.3-to-11.4.md
doc/update/11.3-to-11.4.md
+4
-4
No files found.
doc/update/11.3-to-11.4.md
View file @
22ddd1f8
...
@@ -235,7 +235,7 @@ There might be configuration options available for [`gitlab.yml`][yaml]. View th
...
@@ -235,7 +235,7 @@ There might be configuration options available for [`gitlab.yml`][yaml]. View th
```
sh
```
sh
cd
/home/git/gitlab
cd
/home/git/gitlab
git diff origin/11-
1
-stable:config/gitlab.yml.example origin/11-4-stable:config/gitlab.yml.example
git diff origin/11-
3
-stable:config/gitlab.yml.example origin/11-4-stable:config/gitlab.yml.example
```
```
#### Nginx configuration
#### Nginx configuration
...
@@ -246,10 +246,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes:
...
@@ -246,10 +246,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes:
cd
/home/git/gitlab
cd
/home/git/gitlab
# For HTTPS configurations
# For HTTPS configurations
git diff origin/11-
1
-stable:lib/support/nginx/gitlab-ssl origin/11-4-stable:lib/support/nginx/gitlab-ssl
git diff origin/11-
3
-stable:lib/support/nginx/gitlab-ssl origin/11-4-stable:lib/support/nginx/gitlab-ssl
# For HTTP configurations
# For HTTP configurations
git diff origin/11-
1
-stable:lib/support/nginx/gitlab origin/11-4-stable:lib/support/nginx/gitlab
git diff origin/11-
3
-stable:lib/support/nginx/gitlab origin/11-4-stable:lib/support/nginx/gitlab
```
```
If you are using Strict-Transport-Security in your installation to continue using it you must enable it in your Nginx
If you are using Strict-Transport-Security in your installation to continue using it you must enable it in your Nginx
...
@@ -283,7 +283,7 @@ There might be new configuration options available for [`gitlab.default.example`
...
@@ -283,7 +283,7 @@ There might be new configuration options available for [`gitlab.default.example`
```
sh
```
sh
cd
/home/git/gitlab
cd
/home/git/gitlab
git diff origin/11-
1
-stable:lib/support/init.d/gitlab.default.example origin/11-4-stable:lib/support/init.d/gitlab.default.example
git diff origin/11-
3
-stable:lib/support/init.d/gitlab.default.example origin/11-4-stable:lib/support/init.d/gitlab.default.example
```
```
Ensure you're still up-to-date with the latest init script changes:
Ensure you're still up-to-date with the latest init script changes:
...
...
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