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
1b491c36
Commit
1b491c36
authored
Apr 22, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/gitlabhq/gitlabhq
parents
814a4595
3d3e3913
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
doc/install/installation.md
doc/install/installation.md
+1
-1
doc/update/6.7-to-6.8.md
doc/update/6.7-to-6.8.md
+7
-5
doc/update/README.md
doc/update/README.md
+2
-2
No files found.
doc/install/installation.md
View file @
1b491c36
...
...
@@ -373,7 +373,7 @@ nobody can access your GitLab by using this login information later on.
## Additional markup styles
Apart from the always supported markdown style there are other rich text files that GitLab can display.
But you might have to install a depency to do so.
But you might have to install a depen
den
cy to do so.
Please see the
[
github-markup gem readme
](
https://github.com/gitlabhq/markup#markups
)
for more information.
For example, reStructuredText markup language support requires python-docutils:
...
...
doc/update/6.7-to-6.8.md
View file @
1b491c36
# From 6.
6 to 6.7
# From 6.
7 to 6.8
### 0. Backup
...
...
@@ -9,7 +9,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
### 1. Stop server
sudo service gitlab stop
```
bash
sudo
service gitlab stop
```
### 2. Get latest code
...
...
@@ -37,7 +39,7 @@ sudo -u git -H git checkout 6-8-stable-ee
```
bash
cd
/home/git/gitlab-shell
sudo
-u
git
-H
git fetch
sudo
-u
git
-H
git checkout v1.9.
1
sudo
-u
git
-H
git checkout v1.9.
3
```
### 4. Install libs, migrations, etc.
...
...
@@ -114,10 +116,10 @@ To make sure you didn't miss anything run a more thorough check with:
If all items are green, then congratulations upgrade is complete!
## Things went south? Revert to previous version (6.
6
)
## Things went south? Revert to previous version (6.
7
)
### 1. Revert the code to the previous version
Follow the
[
`upgrade guide from 6.
5 to 6.6`
](
6.5-to-6.6
.md
)
, except for the database migration
Follow the
[
`upgrade guide from 6.
6 to 6.7`
](
6.6-to-6.7
.md
)
, except for the database migration
(The backup is already migrated to the previous version)
### 2. Restore from the backup:
...
...
doc/update/README.md
View file @
1b491c36
+
[
The indivual upgrade guides
](
https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update
)
+
[
Uprader
](
upgrader.md
)
+
[
The indiv
id
ual upgrade guides
](
https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update
)
+
[
Up
g
rader
](
upgrader.md
)
+
[
Ruby
](
ruby.md
)
+
[
Patch versions
](
patch_versions.md
)
+
[
MySQL to PostgreSQL
](
mysql_to_postgresql.md
)
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