Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:
run: bin/rails assets:precompile

# Run the JS tests
- name: 'Run Karma Tests'
run: yarn test
#- name: 'Run Karma Tests'
# run: yarn test

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ jobs:
run: bin/rails assets:precompile

# Run the JS tests
- name: 'Run Karma Tests'
run: yarn test
#- name: 'Run Karma Tests'
# run: yarn test

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
Expand Down
6 changes: 6 additions & 0 deletions app/policies/api/v1/plans_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ def plans_for_user
ids += @user.org.plans.pluck(:id) if @user.can_org_admin?
ids
end

def initialize(client, plan)
super()
@client = client
@plan = plan
end
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/views/api/v1/contributors/_show.json.jbuilder
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

is_contact ||= false

json.name contributor.name
json.name contributor.is_a?(User) ? contributor.name(false) : contributor.name
json.mbox contributor.email

if !is_contact && contributor.selected_roles.any?
Expand Down