Download as
Browse Code »

Commit e1607ec455c423208539c881d057ca8dc07c48e9

Authored by Dmitriy Zaporozhets
2 parents a9661c8d 186e8ad9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 4 changed files with 13 additions and 5 deletions   Show diff stats
1 language: ruby 1 language: ruby
2 env: 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 before_install: 10 before_install:
5 - sudo apt-get install libicu-dev -y 11 - sudo apt-get install libicu-dev -y
6 - gem install charlock_holmes -v="0.6.9" 12 - gem install charlock_holmes -v="0.6.9"
@@ -11,8 +17,9 @@ rvm: @@ -11,8 +17,9 @@ rvm:
11 - 2.0.0 17 - 2.0.0
12 services: 18 services:
13 - mysql 19 - mysql
14 - - postgresql  
15 before_script: 20 before_script:
16 - "cp config/database.yml.$DB config/database.yml" 21 - "cp config/database.yml.$DB config/database.yml"
17 - "cp config/gitlab.yml.example config/gitlab.yml" 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 +6,7 @@ v 6.3.0
6 - Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev) 6 - Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
7 - Security improvements 7 - Security improvements
8 - Added support for GitLab CI 4.0 8 - Added support for GitLab CI 4.0
  9 + - Fixed issue with 500 error when group did not exist
9 10
10 v 6.2.0 11 v 6.2.0
11 - Public project pages are now visible to everyone (files, issues, wik, etc.) 12 - Public project pages are now visible to everyone (files, issues, wik, etc.)
app/controllers/groups_controller.rb
  Diff comments   View file @e1607ec
@@ -102,7 +102,7 @@ class GroupsController < ApplicationController @@ -102,7 +102,7 @@ class GroupsController < ApplicationController
102 102
103 # Dont allow unauthorized access to group 103 # Dont allow unauthorized access to group
104 def authorize_read_group! 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 return render_404 106 return render_404
107 end 107 end
108 end 108 end
lib/gitlab/ldap/user.rb
  Diff comments   View file @e1607ec
@@ -78,7 +78,7 @@ module Gitlab @@ -78,7 +78,7 @@ module Gitlab
78 # * when ldap account was deactivated by change of OU membership in 'dn' 78 # * when ldap account was deactivated by change of OU membership in 'dn'
79 def blocked?(dn) 79 def blocked?(dn)
80 ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf) 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 end 82 end
83 83
84 private 84 private