Skip to content

Commit

Permalink
Merge pull request gitlabhq#174 from etcet/master
Browse files Browse the repository at this point in the history
[Guide] Gitlab 6.3 - CentOS 6.5 - Increment CentOS, ruby, gitlab-shell, and gitlab versions
  • Loading branch information
axilleas committed Dec 20, 2013
2 parents ffb58de + 65cbb7d commit 15b60c3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ information about GitLab version, OS tested on and any other relevant info.
For example some good titles would be:

* [Installation script] GitLab 6.x - Ubuntu 12.04 - Apache
* [Guide] GitLab 6.1 - FreeBSD - postrges, rvm
* [Guide] GitLab 6.1 - FreeBSD - postgres, rvm

## Guides

Expand Down
18 changes: 9 additions & 9 deletions install/centos/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
```
Distribution : CentOS 6.4
GitLab version : 6.0 - 6.2
Distribution : CentOS 6.5
GitLab version : 6.0 - 6.3
Web Server : Apache, Nginx
Init system : sysvinit
Database : MySQL, PostgreSQL
Contributors : @nielsbasjes, @axilleas, @mairin, @ponsjuh, @yorn, @psftw
Contributors : @nielsbasjes, @axilleas, @mairin, @ponsjuh, @yorn, @psftw, @etcet
Additional Notes : In order to get a proper Ruby setup we build it from source
```

Expand Down Expand Up @@ -186,8 +186,8 @@ Download and compile it:

su -
mkdir /tmp/ruby && cd /tmp/ruby
curl --progress ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.gz | tar xz
cd ruby-2.0.0-p247
curl --progress ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p353.tar.gz | tar xz
cd ruby-2.0.0-p353
./configure --prefix=/usr/local/
make && make install

Expand All @@ -197,7 +197,7 @@ installed with:
which ruby
# /usr/local/bin/ruby
ruby -v
# ruby 2.0.0p247 (2013-06-27 revision 41674) [x86_64-linux]
# ruby 2.0.0p353 (2013-11-22 revision 43784) [x86_64-linux]

Install the Bundler Gem:

Expand Down Expand Up @@ -251,7 +251,7 @@ git clone https://github.com/gitlabhq/gitlab-shell.git
cd gitlab-shell
# Switch to right version
git checkout v1.7.4
git checkout v1.8.0
cp config.yml.example config.yml
# Edit config and replace gitlab_url with something like 'http://domain.com/'
Expand Down Expand Up @@ -357,9 +357,9 @@ We'll install GitLab into home directory of the user `git`:
cd /home/git/gitlab

# Checkout to stable release
git checkout 6-2-stable
git checkout 6-3-stable

**Note:** You can change `6-2-stable` to `master` if you want the *bleeding edge* version, but
**Note:** You can change `6-3-stable` to `master` if you want the *bleeding edge* version, but
do so with caution!

### Configure it
Expand Down

0 comments on commit 15b60c3

Please sign in to comment.