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

Dmitriy Zaporozhets
2 parents f34f9a9e f7da04dc
Showing 3 changed files with 6 additions and 11 deletions Show diff stats
doc/permissions/permissions.md
doc/update/6.7-to-6.8.md
lib/gitlab/ldap/adapter.rb
@@ -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| ||||✓|
@@ -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:
  
@@ -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 = {
...	...	@@ -27,7 +27,7 @@ If a user is a GitLab administrator they receive all permissions.
27	27	\|Remove protected branches\| \|\|\|✓\|✓\|
28	28	\|Edit project\| \|\|\|✓\|✓\|
29	29	\|Add Deploy Keys to project\| \|\|\|✓\|✓\|
30		-\|Confiure Project Hooks\| \|\|\|✓\|✓\|
	30	+\|Configure Project Hooks\| \|\|\|✓\|✓\|
31	31	\|Switch visibility level\| \|\|\|\|✓\|
32	32	\|Transfer project to another namespace\| \|\|\|\|✓\|
33	33	\|Remove project\| \|\|\|\|✓\|
...	...
...	...	@@ -62,6 +62,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
62	62
63	63	# Update init.d script
64	64	sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
	65	+sudo chmod +x /etc/init.d/gitlab
65	66
66	67	# Update the logrotate configuration (keep logs for 90 days instead of 52 weeks)
67	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	93
93	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	98	sudo service gitlab start
105	99	sudo service nginx restart
106	100
107		-### 8. Check application status
	101	+### 7. Check application status
108	102
109	103	Check if GitLab and its environment are configured correctly:
110	104
...	...
...	...	@@ -44,7 +44,8 @@ module Gitlab
44	44	def users(field, value)
45	45	if field.to_sym == :dn
46	46	options = {
47		- base: value
	47	+ base: value,
	48	+ scope: Net::LDAP::SearchScope_BaseObject
48	49	}
49	50	else
50	51	options = {
...	...