From e33aa2329936b38568d8621ba427373035a75a6b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 21 Jan 2013 15:51:46 +0200
Subject: [PATCH 1/3] Update docs to use 4-1-stable
---
doc/install/installation.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 27c87ec825f..7107d84617b 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -190,10 +190,10 @@ See `doc/install/databases.md`
cd /home/gitlab/gitlab
# Checkout to stable release
- sudo -u gitlab -H git checkout 4-0-stable
+ sudo -u gitlab -H git checkout 4-1-stable
**Note:**
-You can change `4-0-stable` to `master` if you want the *bleeding edge* version, but
+You can change `4-1-stable` to `master` if you want the *bleeding edge* version, but
do so with caution!
## Configure it
@@ -267,7 +267,7 @@ used for the `email.from` setting in `config/gitlab.yml`)
Download the init script (will be /etc/init.d/gitlab):
- sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab
+ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
Make GitLab start on boot:
@@ -308,7 +308,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the
Download an example site config:
- sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab
+ sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/nginx/gitlab
sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
Make sure to edit the config file to match your setup:
--
GitLab
From 7014c8782bfabf5bc9fadb34d51a57df999fae1d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 21 Jan 2013 15:53:00 +0200
Subject: [PATCH 2/3] Up to 4.1.0
---
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION b/VERSION
index 87db9036a82..ee74734aa22 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0rc1
+4.1.0
--
GitLab
From 6503ba94f4cd741f053356132c452c5a2b817529 Mon Sep 17 00:00:00 2001
From: Lucciniolo <amari.sofiane@gmail.com>
Date: Thu, 7 Feb 2013 11:18:23 +0100
Subject: [PATCH 3/3] Update doc/install/installation.md
---
doc/install/installation.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 7107d84617b..befed921287 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -239,10 +239,10 @@ Make sure to update username/password in config/database.yml.
sudo gem install charlock_holmes --version '0.6.9'
# For MySQL (note, the option says "without")
- sudo -u gitlab -H bundle install --deployment --without development test postgres
+ sudo -u gitlab -H bundle install --deployment --without development test mysql
# Or for PostgreSQL
- sudo -u gitlab -H bundle install --deployment --without development test mysql
+ sudo -u gitlab -H bundle install --deployment --without development test postgres
## Configure Git
--
GitLab