Download as
Browse Code »

Commit 430562f3ca1978f7d094c0bce539b9ecc411d15f

Authored by Dmitriy Zaporozhets
2 parents f34f9a9e f7da04dc
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

Showing 3 changed files with 6 additions and 11 deletions   Show diff stats
doc/permissions/permissions.md
  Diff comments   View file @430562f
@@ -27,7 +27,7 @@ If a user is a GitLab administrator they receive all permissions. @@ -27,7 +27,7 @@ If a user is a GitLab administrator they receive all permissions.
27 |Remove protected branches| |||✓|✓| 27 |Remove protected branches| |||✓|✓|
28 |Edit project| |||✓|✓| 28 |Edit project| |||✓|✓|
29 |Add Deploy Keys to project| |||✓|✓| 29 |Add Deploy Keys to project| |||✓|✓|
30 -|Confiure Project Hooks| |||✓|✓| 30 +|Configure Project Hooks| |||✓|✓|
31 |Switch visibility level| ||||✓| 31 |Switch visibility level| ||||✓|
32 |Transfer project to another namespace| ||||✓| 32 |Transfer project to another namespace| ||||✓|
33 |Remove project| ||||✓| 33 |Remove project| ||||✓|
doc/update/6.7-to-6.8.md
  Diff comments   View file @430562f
@@ -62,6 +62,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS @@ -62,6 +62,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
62 62
63 # Update init.d script 63 # Update init.d script
64 sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab 64 sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
  65 +sudo chmod +x /etc/init.d/gitlab
65 66
66 # Update the logrotate configuration (keep logs for 90 days instead of 52 weeks) 67 # Update the logrotate configuration (keep logs for 90 days instead of 52 weeks)
67 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab 68 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 @@ -92,19 +93,12 @@ If you are using HTTPS, disable gzip as in [this commit](https://gitlab.com/gitl
92 93
93 To improve performance, enable gzip asset compression as seen [in this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/8af94ed75505f0253823b9b2d44320fecea5b5fb). 94 To improve performance, enable gzip asset compression as seen [in this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/8af94ed75505f0253823b9b2d44320fecea5b5fb).
94 95
95 -### 6. Update Init script  
96 -  
97 -```bash  
98 -sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab  
99 -sudo chmod +x /etc/init.d/gitlab  
100 -```  
101 -  
102 -### 7. Start application 96 +### 6. Start application
103 97
104 sudo service gitlab start 98 sudo service gitlab start
105 sudo service nginx restart 99 sudo service nginx restart
106 100
107 -### 8. Check application status 101 +### 7. Check application status
108 102
109 Check if GitLab and its environment are configured correctly: 103 Check if GitLab and its environment are configured correctly:
110 104
lib/gitlab/ldap/adapter.rb
  Diff comments   View file @430562f
@@ -44,7 +44,8 @@ module Gitlab @@ -44,7 +44,8 @@ module Gitlab
44 def users(field, value) 44 def users(field, value)
45 if field.to_sym == :dn 45 if field.to_sym == :dn
46 options = { 46 options = {
47 - base: value 47 + base: value,
  48 + scope: Net::LDAP::SearchScope_BaseObject
48 } 49 }
49 else 50 else
50 options = { 51 options = {