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

Dmitriy Zaporozhets
2 parents a9661c8d 186e8ad9
Showing 4 changed files with 13 additions and 5 deletions Show diff stats
.travis.yml
CHANGELOG
app/controllers/groups_controller.rb
lib/gitlab/ldap/user.rb
 language: ruby
 env:
-  - DB=mysql TRAVIS=true
+  global:
+    - DB=mysql
+    - TRAVIS=true
+  matrix:
+    - TASK=spinach
+    - TASK=spec
+    - TASK=jasmine:ci
 before_install:
   - sudo apt-get install libicu-dev -y
   - gem install charlock_holmes -v="0.6.9"
@@ -11,8 +17,9 @@ rvm:
   - 2.0.0
 services:
   - mysql
-  - postgresql
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"
-script: "bundle exec rake gitlab:test --trace"
+  - "bundle exec rake db:setup"
+  - "bundle exec rake db:seed_fu"
+script: "bundle exec rake $TASK --trace"
@@ -6,6 +6,7 @@ v 6.3.0
   - Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
   - Security improvements
   - Added support for GitLab CI 4.0
+  - Fixed issue with 500 error when group did not exist
  
 v 6.2.0
   - Public project pages are now visible to everyone (files, issues, wik, etc.)
@@ -102,7 +102,7 @@ class GroupsController &lt; ApplicationController
  
   # Dont allow unauthorized access to group
   def authorize_read_group!
-    unless projects.present? or can?(current_user, :read_group, @group)
+    unless @group and (projects.present? or can?(current_user, :read_group, @group))
       return render_404
     end
   end
@@ -78,7 +78,7 @@ module Gitlab
         # * when ldap account was deactivated by change of OU membership in 'dn'
         def blocked?(dn)
           ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf)
-          ldap.connection.search(base: dn, size: 1).blank?
+          ldap.connection.search(base: dn, scope: Net::LDAP::SearchScope_BaseObject, size: 1).blank?
         end
  
         private
1	1	language: ruby
2	2	env:
3		- - DB=mysql TRAVIS=true
	3	+ global:
	4	+ - DB=mysql
	5	+ - TRAVIS=true
	6	+ matrix:
	7	+ - TASK=spinach
	8	+ - TASK=spec
	9	+ - TASK=jasmine:ci
4	10	before_install:
5	11	- sudo apt-get install libicu-dev -y
6	12	- gem install charlock_holmes -v="0.6.9"
...	...	@@ -11,8 +17,9 @@ rvm:
11	17	- 2.0.0
12	18	services:
13	19	- mysql
14		- - postgresql
15	20	before_script:
16	21	- "cp config/database.yml.$DB config/database.yml"
17	22	- "cp config/gitlab.yml.example config/gitlab.yml"
18		-script: "bundle exec rake gitlab:test --trace"
	23	+ - "bundle exec rake db:setup"
	24	+ - "bundle exec rake db:seed_fu"
	25	+script: "bundle exec rake $TASK --trace"
...	...
...	...	@@ -6,6 +6,7 @@ v 6.3.0
6	6	- Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
7	7	- Security improvements
8	8	- Added support for GitLab CI 4.0
	9	+ - Fixed issue with 500 error when group did not exist
9	10
10	11	v 6.2.0
11	12	- Public project pages are now visible to everyone (files, issues, wik, etc.)
...	...
...	...	@@ -102,7 +102,7 @@ class GroupsController < ApplicationController
102	102
103	103	# Dont allow unauthorized access to group
104	104	def authorize_read_group!
105		- unless projects.present? or can?(current_user, :read_group, @group)
	105	+ unless @group and (projects.present? or can?(current_user, :read_group, @group))
106	106	return render_404
107	107	end
108	108	end
...	...
...	...	@@ -78,7 +78,7 @@ module Gitlab
78	78	# * when ldap account was deactivated by change of OU membership in 'dn'
79	79	def blocked?(dn)
80	80	ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf)
81		- ldap.connection.search(base: dn, size: 1).blank?
	81	+ ldap.connection.search(base: dn, scope: Net::LDAP::SearchScope_BaseObject, size: 1).blank?
82	82	end
83	83
84	84	private
...	...