Skip to content

Commit

Permalink
Merge remote-tracking branch 'starter-repo/main' into jeremy/update-1…
Browse files Browse the repository at this point in the history 
….3.13
  • Loading branch information
@jagthedrummer
jagthedrummer committed Aug 23, 2023
2 parents dfd0a17 + b207b2c commit f3af9bc
Show file tree
Hide file tree
Showing 21 changed files with 248 additions and 138 deletions.
175 changes: 89 additions & 86 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.7)
actionpack (= 7.0.7)
activesupport (= 7.0.7)
actioncable (7.0.7.2)
actionpack (= 7.0.7.2)
activesupport (= 7.0.7.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.7)
actionpack (= 7.0.7)
activejob (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
actionmailbox (7.0.7.2)
actionpack (= 7.0.7.2)
activejob (= 7.0.7.2)
activerecord (= 7.0.7.2)
activestorage (= 7.0.7.2)
activesupport (= 7.0.7.2)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.7)
actionpack (= 7.0.7)
actionview (= 7.0.7)
activejob (= 7.0.7)
activesupport (= 7.0.7)
actionmailer (7.0.7.2)
actionpack (= 7.0.7.2)
actionview (= 7.0.7.2)
activejob (= 7.0.7.2)
activesupport (= 7.0.7.2)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.7)
actionview (= 7.0.7)
activesupport (= 7.0.7)
actionpack (7.0.7.2)
actionview (= 7.0.7.2)
activesupport (= 7.0.7.2)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.7)
actionpack (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
actiontext (7.0.7.2)
actionpack (= 7.0.7.2)
activerecord (= 7.0.7.2)
activestorage (= 7.0.7.2)
activesupport (= 7.0.7.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.7)
activesupport (= 7.0.7)
actionview (7.0.7.2)
activesupport (= 7.0.7.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_hash (3.2.0)
activesupport (>= 5.0.0)
activejob (7.0.7)
activesupport (= 7.0.7)
activejob (7.0.7.2)
activesupport (= 7.0.7.2)
globalid (>= 0.3.6)
activemodel (7.0.7)
activesupport (= 7.0.7)
activerecord (7.0.7)
activemodel (= 7.0.7)
activesupport (= 7.0.7)
activestorage (7.0.7)
actionpack (= 7.0.7)
activejob (= 7.0.7)
activerecord (= 7.0.7)
activesupport (= 7.0.7)
activemodel (7.0.7.2)
activesupport (= 7.0.7.2)
activerecord (7.0.7.2)
activemodel (= 7.0.7.2)
activesupport (= 7.0.7.2)
activestorage (7.0.7.2)
actionpack (= 7.0.7.2)
activejob (= 7.0.7.2)
activerecord (= 7.0.7.2)
activesupport (= 7.0.7.2)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.7)
activesupport (7.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -73,30 +73,31 @@ GEM
ast (2.4.2)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
aws-partitions (1.807.0)
aws-sdk-core (3.180.3)
aws-partitions (1.809.0)
aws-sdk-core (3.181.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.71.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.132.1)
aws-sdk-core (~> 3, >= 3.179.0)
aws-sdk-s3 (1.133.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
aws_cf_signer (0.1.3)
base64 (0.1.1)
bcrypt (3.1.19)
bindex (0.8.1)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
builder (3.2.4)
bullet_train (1.3.8)
bullet_train (1.3.13)
awesome_print
bullet_train-fields
bullet_train-has_uuid
Expand Down Expand Up @@ -128,7 +129,7 @@ GEM
unicode-emoji
valid_email
xxhash
bullet_train-api (1.3.8)
bullet_train-api (1.3.13)
bullet_train
doorkeeper
factory_bot
Expand All @@ -137,53 +138,53 @@ GEM
pagy_cursor
rack-cors
rails (>= 6.0.0)
bullet_train-fields (1.3.8)
bullet_train-fields (1.3.13)
chronic
cloudinary
phonelib
rails (>= 6.0.0)
bullet_train-has_uuid (1.3.8)
bullet_train-has_uuid (1.3.13)
rails (>= 6.0.0)
bullet_train-incoming_webhooks (1.3.8)
bullet_train-incoming_webhooks (1.3.13)
bullet_train-super_scaffolding
rails (>= 6.0.0)
bullet_train-integrations (1.3.8)
bullet_train-integrations (1.3.13)
rails (>= 6.0.0)
bullet_train-integrations-stripe (1.3.8)
bullet_train-integrations-stripe (1.3.13)
omniauth
omniauth-rails_csrf_protection
omniauth-stripe-connect
rails (>= 6.0.0)
stripe
bullet_train-obfuscates_id (1.3.8)
bullet_train-obfuscates_id (1.3.13)
hashids
rails (>= 6.0.0)
bullet_train-outgoing_webhooks (1.3.8)
bullet_train-outgoing_webhooks (1.3.13)
public_suffix
rails (>= 6.0.0)
bullet_train-roles (1.3.8)
bullet_train-roles (1.3.13)
active_hash
activesupport
cancancan
bullet_train-routes (1.0.0)
rails (>= 6.0.0)
bullet_train-scope_questions (1.3.8)
bullet_train-scope_questions (1.3.13)
rails (>= 6.0.0)
bullet_train-scope_validator (1.3.8)
bullet_train-sortable (1.3.8)
bullet_train-scope_validator (1.3.13)
bullet_train-sortable (1.3.13)
rails (>= 6.0.0)
bullet_train-super_load_and_authorize_resource (1.3.8)
bullet_train-super_load_and_authorize_resource (1.3.13)
rails (>= 6.0.0)
bullet_train-super_scaffolding (1.3.8)
bullet_train-super_scaffolding (1.3.13)
bullet_train
indefinite_article
rails (>= 6.0.0)
bullet_train-themes (1.3.8)
bullet_train-themes (1.3.13)
rails (>= 6.0.0)
bullet_train-themes-light (1.3.8)
bullet_train-themes-light (1.3.13)
bullet_train-themes-tailwind_css
rails (>= 6.0.0)
bullet_train-themes-tailwind_css (1.3.8)
bullet_train-themes-tailwind_css (1.3.13)
bullet_train
bullet_train-themes
rails (>= 6.0.0)
Expand Down Expand Up @@ -304,7 +305,7 @@ GEM
railties (>= 6.0.0)
json (2.6.3)
jwt (2.7.1)
knapsack_pro (5.3.5)
knapsack_pro (5.4.1)
rake
language_server-protocol (3.17.0.3)
launchy (2.5.2)
Expand All @@ -331,7 +332,7 @@ GEM
microscope (1.1.1)
activerecord (>= 4.1.0)
activesupport (>= 4.1.0)
mime-types (3.5.0)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0808)
mini_magick (4.12.0)
Expand Down Expand Up @@ -425,20 +426,20 @@ GEM
rack (>= 1.2.0)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.7)
actioncable (= 7.0.7)
actionmailbox (= 7.0.7)
actionmailer (= 7.0.7)
actionpack (= 7.0.7)
actiontext (= 7.0.7)
actionview (= 7.0.7)
activejob (= 7.0.7)
activemodel (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
rails (7.0.7.2)
actioncable (= 7.0.7.2)
actionmailbox (= 7.0.7.2)
actionmailer (= 7.0.7.2)
actionpack (= 7.0.7.2)
actiontext (= 7.0.7.2)
actionview (= 7.0.7.2)
activejob (= 7.0.7.2)
activemodel (= 7.0.7.2)
activerecord (= 7.0.7.2)
activestorage (= 7.0.7.2)
activesupport (= 7.0.7.2)
bundler (>= 1.15.0)
railties (= 7.0.7)
railties (= 7.0.7.2)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -455,9 +456,9 @@ GEM
json
require_all (~> 3.0)
ruby-progressbar
railties (7.0.7)
actionpack (= 7.0.7)
activesupport (= 7.0.7)
railties (7.0.7.2)
actionpack (= 7.0.7.2)
activesupport (= 7.0.7.2)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -469,7 +470,7 @@ GEM
redis-client (0.16.0)
connection_pool
regexp_parser (2.8.1)
reline (0.3.7)
reline (0.3.8)
io-console (~> 0.5)
require_all (3.0.0)
responders (3.1.0)
Expand All @@ -486,19 +487,21 @@ GEM
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
rubocop (1.52.1)
rubocop (1.56.1)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-performance (1.18.0)
rubocop-performance (1.19.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-openai (5.1.0)
Expand Down Expand Up @@ -547,18 +550,18 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
standard (1.30.1)
standard (1.31.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.52.0)
rubocop (~> 1.56.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.1.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.1.2)
standard-performance (1.2.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.18.0)
rubocop-performance (~> 1.19.0)
stimulus-rails (1.2.2)
railties (>= 6.0.0)
stripe (9.0.0)
Expand Down
21 changes: 21 additions & 0 deletions app/controllers/api/v1/memberships_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
class Api::V1::MembershipsController < Api::V1::ApplicationController
include Api::V1::Memberships::ControllerBase

private

def permitted_fields
[
# 🚅 super scaffolding will insert new fields above this line.
]
end

def permitted_arrays
{
# 🚅 super scaffolding will insert new arrays above this line.
}
end

def process_params(strong_params)
strong_params
end
end
8 changes: 5 additions & 3 deletions app/views/account/shared/_menu.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@
<% end %>
<% end %>
<%= render 'account/shared/menu/subsection', title: t('menus.main.labels.developers'), expand: expand do %>
<%= render 'account/platform/applications/menu_item' %>
<%= render 'account/webhooks/outgoing/endpoints/menu_item' if webhooks_enabled? %>
<% unless disable_developer_menu? %>
<%= render 'account/shared/menu/subsection', title: t('menus.main.labels.developers'), expand: expand do %>
<%= render 'account/platform/applications/menu_item' %>
<%= render 'account/webhooks/outgoing/endpoints/menu_item' if webhooks_enabled? %>
<% end %>
<% end %>
<%= render 'account/shared/menu/subsection', title: t('menus.main.labels.team'), expand: expand do %>
Expand Down
16 changes: 16 additions & 0 deletions app/views/api/v1/memberships/_membership.json.jbuilder
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
json.extract! membership,
:id,
:user_id,
:team_id,
:invitation_id,
:user_first_name,
:user_last_name,
:user_profile_photo_id,
:user_email,
:added_by_id,
:platform_agent_of_id,
:role_ids,
:platform_agent,
# 🚅 super scaffolding will insert new fields above this line.
:created_at,
:updated_at
Loading

0 comments on commit f3af9bc

Please sign in to comment.