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
Jérome Perrin
gitlab-ce
Commits
33431c3e
Commit
33431c3e
authored
Aug 23, 2014
by
Robert Schilling
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7585 from bbodenmiller/patch-11
clarify which configs should be updated
parents
9900c5bf
aef3a5bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
doc/update/7.1-to-7.2.md
doc/update/7.1-to-7.2.md
+8
-2
No files found.
doc/update/7.1-to-7.2.md
View file @
33431c3e
...
@@ -41,7 +41,7 @@ For GitLab Enterprise Edition:
...
@@ -41,7 +41,7 @@ For GitLab Enterprise Edition:
sudo
-u
git
-H
git checkout 7-2-stable-ee
sudo
-u
git
-H
git checkout 7-2-stable-ee
```
```
### 3. Update gitlab-shell
(and its config)
### 3. Update gitlab-shell
```
bash
```
bash
cd
/home/git/gitlab-shell
cd
/home/git/gitlab-shell
...
@@ -84,12 +84,18 @@ sudo chmod +x /etc/init.d/gitlab
...
@@ -84,12 +84,18 @@ sudo chmod +x /etc/init.d/gitlab
#### New configuration options for gitlab.yml
#### New configuration options for gitlab.yml
There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml
if desired
.
There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml.
```
```
git diff 7-1-stable:config/gitlab.yml.example 7-2-stable:config/gitlab.yml.example
git diff 7-1-stable:config/gitlab.yml.example 7-2-stable:config/gitlab.yml.example
```
```
Update rack attack middleware config
```
sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
```
### 7. Start application
### 7. Start application
sudo service gitlab start
sudo service gitlab start
...
...
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