From de794b6a77dba50a76e79538797ce2873c1e8700 Mon Sep 17 00:00:00 2001
From: Ben Bytheway <bbytheway@gmail.com>
Date: Wed, 23 Apr 2014 21:00:56 -0600
Subject: [PATCH 1/3] Add scoping to ldap lookup when only dn given

---
 lib/gitlab/ldap/adapter.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index 983a2956a3..0777558d64 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -44,7 +44,8 @@ module Gitlab
       def users(field, value)
         if field.to_sym == :dn
           options = {
-            base: value
+            base: value,
+            scope: Net::LDAP::SearchScope_BaseObject
           }
         else
           options = {

From 1eed8965783786b1ec07286e78f30750d48734a4 Mon Sep 17 00:00:00 2001
From: Cho Cheuk Ping <chocheukping@gmail.com>
Date: Fri, 25 Apr 2014 18:49:21 +0800
Subject: [PATCH 2/3] Fix typo: Confiure -> Configure

---
 doc/permissions/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index ac4bdefddd..9be6423f66 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -27,7 +27,7 @@ If a user is a GitLab administrator they receive all permissions.
 |Remove protected branches| |||✓|✓|
 |Edit project| |||✓|✓|
 |Add Deploy Keys to project| |||✓|✓|
-|Confiure Project Hooks| |||✓|✓|
+|Configure Project Hooks| |||✓|✓|
 |Switch visibility level| ||||✓|
 |Transfer project to another namespace| ||||✓|
 |Remove project| ||||✓|

From 5ac015664d6bc06fec5c3d16b9c5a08c8957d453 Mon Sep 17 00:00:00 2001
From: Xiaoyu Tai <taixiaoyu@gmail.com>
Date: Sun, 27 Apr 2014 20:25:35 +0800
Subject: [PATCH 3/3] init.d script copy duplication

Copy init.d script twice in the guide. Deleted the second one.
---
 doc/update/6.7-to-6.8.md | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/doc/update/6.7-to-6.8.md b/doc/update/6.7-to-6.8.md
index 63023fd384..457433c648 100644
--- a/doc/update/6.7-to-6.8.md
+++ b/doc/update/6.7-to-6.8.md
@@ -62,6 +62,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
 
 # Update init.d script
 sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+sudo chmod +x /etc/init.d/gitlab
 
 # Update the logrotate configuration (keep logs for 90 days instead of 52 weeks)
 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
@@ -92,19 +93,12 @@ If you are using HTTPS, disable gzip as in [this commit](https://gitlab.com/gitl
 
 To improve performance, enable gzip asset compression as seen [in this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/8af94ed75505f0253823b9b2d44320fecea5b5fb).
 
-### 6. Update Init script
-
-```bash
-sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
-sudo chmod +x /etc/init.d/gitlab
-```
-
-### 7. Start application
+### 6. Start application
 
     sudo service gitlab start
     sudo service nginx restart
 
-### 8. Check application status
+### 7. Check application status
 
 Check if GitLab and its environment are configured correctly: