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

.travis.yml

 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"

CHANGELOG

@@ -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.)

app/controllers/groups_controller.rb

@@ -102,7 +102,7 @@ class GroupsController < 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

lib/gitlab/ldap/user.rb

@@ -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