CentOS 6.4 install GitLab 6 0 stable ssh Auth fail (!4948) · Merge requests · gpt / large_projects / gitlabhq1 · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

An error occurred while fetching the assigned milestone of the selected merge_request.

Closed gitlab-qa-bot requested to merge 6-0-stable into master 11 years ago

Viewing commit 1c2be671

Show latest version

2 files

+ 14

− 1

Files

2

1c2be671

Fix several_namespaces? to work with multiple ownership of groups · 1c2be671
Stephen Holdaway authored 11 years ago

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

app/models/user.rb

+ 1

− 1

@@ -319,7 +319,7 @@ class User < ActiveRecord::Base
  end

  def several_namespaces?
    namespaces.many?
    namespaces.many? || owned_groups.any?
  end

  def namespace_id