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
54b13dd4
Commit
54b13dd4
authored
Apr 12, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates missing links
parent
798f815e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
doc/update/10.6-to-10.7.md
doc/update/10.6-to-10.7.md
+7
-7
No files found.
doc/update/10.6-to-10.7.md
View file @
54b13dd4
...
@@ -229,10 +229,10 @@ Ensure you're still up-to-date with the latest NGINX configuration changes:
...
@@ -229,10 +229,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/10-
5-stable:lib/support/nginx/gitlab-ssl origin/10-6
-stable:lib/support/nginx/gitlab-ssl
git diff origin/10-
6-stable:lib/support/nginx/gitlab-ssl origin/10-7
-stable:lib/support/nginx/gitlab-ssl
# For HTTP configurations
# For HTTP configurations
git diff origin/10-
5-stable:lib/support/nginx/gitlab origin/10-6
-stable:lib/support/nginx/gitlab
git diff origin/10-
6-stable:lib/support/nginx/gitlab origin/10-7
-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
...
@@ -244,7 +244,7 @@ will need to let gitlab-workhorse listen on a TCP port. You can do this
...
@@ -244,7 +244,7 @@ will need to let gitlab-workhorse listen on a TCP port. You can do this
via [/etc/default/gitlab].
via [/etc/default/gitlab].
[
Apache templates
]:
https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
[
Apache templates
]:
https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
[
/etc/default/gitlab
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
6
-stable/lib/support/init.d/gitlab.default.example#L38
[
/etc/default/gitlab
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
7
-stable/lib/support/init.d/gitlab.default.example#L38
#### SMTP configuration
#### SMTP configuration
...
@@ -257,7 +257,7 @@ ActionMailer::Base.delivery_method = :smtp
...
@@ -257,7 +257,7 @@ ActionMailer::Base.delivery_method = :smtp
See [smtp_settings.rb.sample] as an example.
See [smtp_settings.rb.sample] as an example.
[
smtp_settings.rb.sample
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
6
-stable/config/initializers/smtp_settings.rb.sample#L13
[
smtp_settings.rb.sample
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
7
-stable/config/initializers/smtp_settings.rb.sample#L13
#### Init script
#### Init script
...
@@ -266,7 +266,7 @@ There might be new configuration options available for [`gitlab.default.example`
...
@@ -266,7 +266,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/10-
5-stable:lib/support/init.d/gitlab.default.example origin/10-6
-stable:lib/support/init.d/gitlab.default.example
git diff origin/10-
6-stable:lib/support/init.d/gitlab.default.example origin/10-7
-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:
...
@@ -357,5 +357,5 @@ sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
...
@@ -357,5 +357,5 @@ sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
If you have more than one backup
`*.tar`
file(s) please add
`BACKUP=timestamp_of_backup`
to the command above.
If you have more than one backup
`*.tar`
file(s) please add
`BACKUP=timestamp_of_backup`
to the command above.
[
yaml
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
6
-stable/config/gitlab.yml.example
[
yaml
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
7
-stable/config/gitlab.yml.example
[
gl-example
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
6
-stable/lib/support/init.d/gitlab.default.example
[
gl-example
]:
https://gitlab.com/gitlab-org/gitlab-ce/blob/10-
7
-stable/lib/support/init.d/gitlab.default.example
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