diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-18 18:27:11 +0300 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-05-18 20:42:28 +0300 |
| commit | 8cba1f51668d11918a963ca46f78e26b9c8d0836 (patch) | |
| tree | e3850034d0b73660c57e85590a1d007d8336055a /app/models | |
| parent | 8fa6b11c642383029b6e6c63b19fb6e40aab92ae (diff) | |
Merge branch 'mk-fix-issue-1843' into 'master'
Fix root groups redirecting to group owner
Closes #32474
See merge request !11465
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/namespace.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 397dc7a25ab..d6b0ab0e52c 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -46,7 +46,7 @@ class Namespace < ActiveRecord::Base before_destroy(prepend: true) { prepare_for_destroy } after_destroy :rm_dir - scope :root, -> { where('type IS NULL') } + scope :for_user, -> { where('type IS NULL') } scope :with_statistics, -> do joins('LEFT JOIN project_statistics ps ON ps.namespace_id = namespaces.id') diff --git a/app/models/user.rb b/app/models/user.rb index 4e5f94683b8..3228081a999 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -338,7 +338,7 @@ class User < ActiveRecord::Base end def find_by_full_path(path, follow_redirects: false) - namespace = Namespace.find_by_full_path(path, follow_redirects: follow_redirects) + namespace = Namespace.for_user.find_by_full_path(path, follow_redirects: follow_redirects) namespace&.owner end |