From 970f86077adf2857ac3b3c1d7b0dc366a39f41f3 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 8 Feb 2013 09:02:30 +0200
Subject: [PATCH] Up to 4.2

---
 CHANGELOG                   | 7 +++++++
 VERSION                     | 2 +-
 doc/install/installation.md | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4510b6d5..5bc174a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,11 @@
 v 4.2.0
+  - Async gitolite calls
+  - Teams
+  - Project listing page
+  - Improved search
+  - Groups API
+  - Improved Network Graph
+  - Edit page for group
   - User show page. Via /u/username
   - Show help contents on pages for better navigation
 
diff --git a/VERSION b/VERSION
index b5d76fb8..6aba2b24 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.0pre
+4.2.0
diff --git a/doc/install/installation.md b/doc/install/installation.md
index e4217637..f56d1c71 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -191,10 +191,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
     cd /home/gitlab/gitlab
    
     # Checkout to stable release
-    sudo -u gitlab -H git checkout 4-1-stable
+    sudo -u gitlab -H git checkout 4-2-stable
 
 **Note:**
-You can change `4-1-stable` to `master` if you want the *bleeding edge* version, but
+You can change `4-2-stable` to `master` if you want the *bleeding edge* version, but
 do so with caution!
 
 ## Configure it
@@ -268,7 +268,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-2-stable/init.d/gitlab
     sudo chmod +x /etc/init.d/gitlab
 
 Make GitLab start on boot:
@@ -309,7 +309,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-2-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: