Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a6aac1b5
Commit
a6aac1b5
authored
Oct 19, 2020
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Specify correct finder for gitlab team mebers
- needs to be scoped to path and parent_id
parent
5cf068a4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
ee/changelogs/unreleased/update-gitlab-com-group-name-constant.yml
...logs/unreleased/update-gitlab-com-group-name-constant.yml
+5
-0
ee/lib/gitlab/com.rb
ee/lib/gitlab/com.rb
+1
-1
ee/spec/requests/api/experiments_spec.rb
ee/spec/requests/api/experiments_spec.rb
+1
-1
ee/spec/support/shared_contexts/gitlab_team_member_shared_context.rb
...port/shared_contexts/gitlab_team_member_shared_context.rb
+1
-1
No files found.
ee/changelogs/unreleased/update-gitlab-com-group-name-constant.yml
0 → 100644
View file @
a6aac1b5
---
title
:
Specify correct finder for gitlab team mebers
merge_request
:
45550
author
:
type
:
fixed
ee/lib/gitlab/com.rb
View file @
a6aac1b5
...
...
@@ -21,7 +21,7 @@ module Gitlab
def
self
.
gitlab_com_user_ids
l1_cache_backend
.
fetch
(
ALLOWED_USER_IDS_KEY
,
expires_in:
EXPIRY_TIME_L1_CACHE
)
do
l2_cache_backend
.
fetch
(
ALLOWED_USER_IDS_KEY
,
expires_in:
EXPIRY_TIME_L2_CACHE
)
do
group
=
Group
.
find_by
_name
(
GITLAB_COM_GROUP
)
group
=
Group
.
find_by
(
path:
GITLAB_COM_GROUP
,
parent_id:
nil
)
if
group
GroupMembersFinder
.
new
(
group
).
execute
.
pluck
(
:user_id
)
...
...
ee/spec/requests/api/experiments_spec.rb
View file @
a6aac1b5
...
...
@@ -4,7 +4,7 @@ require 'spec_helper'
RSpec
.
describe
API
::
Experiments
do
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:group
)
{
create
(
:group
,
name:
'gitlab-com'
)
}
let_it_be
(
:group
)
{
create
(
:group
,
name:
'
GitLab.com'
,
path:
'
gitlab-com'
)
}
describe
'GET /experiments'
do
context
'when on .com'
do
...
...
ee/spec/support/shared_contexts/gitlab_team_member_shared_context.rb
View file @
a6aac1b5
# frozen_string_literal: true
RSpec
.
shared_context
'gitlab team member'
do
let_it_be
(
:namespace
)
{
create
(
:group
,
name:
'gitlab-com'
)
}
let_it_be
(
:namespace
)
{
create
(
:group
,
name:
'
GitLab.com'
,
path:
'
gitlab-com'
)
}
before
do
namespace
.
add_developer
(
user
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment