diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-29 08:00:00 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-29 08:00:00 +0200 |
| commit | 430562f3ca1978f7d094c0bce539b9ecc411d15f (patch) | |
| tree | 13a4fc34f7cf7c3c1bfff493335f16b99a00f0db | |
| parent | f34f9a9ef364a5d67abece6dc235b015aa0fb380 (diff) | |
| parent | f7da04dccde6deccc10a98a024e6230baaf08dd5 (diff) | |
| download | gitlab-ce-430562f3ca1978f7d094c0bce539b9ecc411d15f.tar.gz | |
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
| -rw-r--r-- | doc/permissions/permissions.md | 2 | ||||
| -rw-r--r-- | doc/update/6.7-to-6.8.md | 12 | ||||
| -rw-r--r-- | lib/gitlab/ldap/adapter.rb | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index ac4bdefddd5..9be6423f667 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| ||||✓| diff --git a/doc/update/6.7-to-6.8.md b/doc/update/6.7-to-6.8.md index 63023fd384b..457433c6482 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: diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb index 983a2956a35..0777558d643 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 = { |