Skip to content

Commit 57fb191

Browse files
committed
fix(front): only email invite for OS installations
1 parent 1550440 commit 57fb191

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

front/lib/front_web/views/people_view.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ defmodule FrontWeb.PeopleView do
4848
@spec available_user_providers(org_id :: String.t()) :: [String.t()]
4949
defp available_user_providers(org_id) do
5050
[
51-
{"email", FeatureProvider.feature_enabled?(:email_members, param: org_id) || Front.ce?()},
52-
{"github", !Front.ce?()},
53-
{"gitlab", FeatureProvider.feature_enabled?(:gitlab, param: org_id) && !Front.ce?()},
54-
{"bitbucket", FeatureProvider.feature_enabled?(:bitbucket, param: org_id) && !Front.ce?()}
51+
{"email", FeatureProvider.feature_enabled?(:email_members, param: org_id)},
52+
{"github", Front.saas?() || FeatureProvider.feature_enabled?(:github_user_provider, param: org_id)},
53+
{"gitlab", (FeatureProvider.feature_enabled?(:gitlab, param: org_id) && Front.saas?()) || FeatureProvider.feature_enabled?(:gitlab_user_provider, param: org_id)},
54+
{"bitbucket", (FeatureProvider.feature_enabled?(:bitbucket, param: org_id) && Front.saas?) || FeatureProvider.feature_enabled?(:bitbucket_user_provider, param: org_id)}
5555
]
5656
|> Enum.map(fn
5757
{name, true} ->

helm-chart/templates/configmaps/features.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ data:
2828
enabled: true
2929
github_oauth_token:
3030
enabled: false
31+
email_members:
32+
enabled: true
33+
github_user_provider:
34+
enabled: false
35+
gitlab_user_provider:
36+
enabled: false
37+
bitbucket_user_provider:
38+
enabled: false
3139
deployment_targets:
3240
enabled: false
3341
expose_cloud_agent_types:
@@ -134,6 +142,14 @@ data:
134142
enabled: true
135143
github_oauth_token:
136144
enabled: false
145+
email_members:
146+
enabled: true
147+
github_user_provider:
148+
enabled: false
149+
gitlab_user_provider:
150+
enabled: false
151+
bitbucket_user_provider:
152+
enabled: false
137153
deployment_targets:
138154
enabled: true
139155
expose_cloud_agent_types:
@@ -148,7 +164,7 @@ data:
148164
enabled: true
149165
max_paralellism_in_org:
150166
quantity: 500
151-
max_people_in_organization:
167+
max_people_in_org:
152168
quantity: 600
153169
max_projects_in_org:
154170
quantity: 10000

0 commit comments

Comments
 (0)