Skip to content

Commit df8a16f

Browse files
committed
chore: Run mix.format
1 parent b98be6c commit df8a16f

File tree

14 files changed

+27
-35
lines changed

14 files changed

+27
-35
lines changed

apps/cf/lib/accounts/invitations.ex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,7 @@ defmodule CF.Accounts.Invitations do
163163
frontend_url = Application.fetch_env!(:cf, :frontend_url)
164164

165165
Logger.info(
166-
"Generated #{number} invites for token #{token}. Url: #{frontend_url}/signup?invitation_token=#{
167-
token
168-
}"
166+
"Generated #{number} invites for token #{token}. Url: #{frontend_url}/signup?invitation_token=#{token}"
169167
)
170168
end
171169

apps/cf/lib/accounts/user_permissions.ex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ defmodule CF.Accounts.UserPermissions do
6666
if action_count >= limit + @limit_warning_threshold,
6767
do:
6868
Logger.warn(fn ->
69-
"User #{user.username} (#{user.id}) overthrown its limit for [#{action_type} #{
70-
entity
71-
}] (#{action_count}/#{limit})"
69+
"User #{user.username} (#{user.id}) overthrown its limit for [#{action_type} #{entity}] (#{action_count}/#{limit})"
7270
end)
7371

7472
{:error, @error_limit_reached}

apps/cf/mix.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ defmodule CF.Mixfile do
3737
# Type `mix help deps` for examples and options.
3838
defp deps do
3939
[
40-
{:phoenix, "~> 1.4.18", override: true},
41-
{:phoenix_html, "~> 2.6"},
40+
{:phoenix, "~> 1.5.14", override: true},
41+
{:phoenix_html, "~> 2.14.3"},
4242
{:gettext, "~> 0.13.1"},
4343
{:google_api_you_tube, "~> 0.42.0"},
4444
{:kaur, "~> 1.1"},

apps/cf_atom_feed/test/comments_test.exs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ defmodule CF.AtomFeed.CommentsTest do
3030
# Check comment entries
3131
for comment <- comments do
3232
assert feed =~
33-
~r(https://TEST_FRONTEND/videos/[a-zA-Z0-9]+\?statement=#{comment.statement_id}&amp;c=#{
34-
comment.id
35-
}"/>)
33+
~r(https://TEST_FRONTEND/videos/[a-zA-Z0-9]+\?statement=#{comment.statement_id}&amp;c=#{comment.id}"/>)
3634

3735
assert feed =~ ~r(<title>New Comment from .+ on ##{comment.statement_id}</title>)
3836
end

apps/cf_graphql/config/config.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ config :cf_graphql,
1515
config :cf_graphql, CF.GraphQLWeb.Endpoint,
1616
url: [host: "localhost"],
1717
secret_key_base: "Nl5lfMlBMvQpY3n74G9iNTxH4okMpbMWArWst9Vhj75tl+m2PuV+KPwjX0fNMaa8",
18-
pubsub: [name: CF.Graphql.PubSub, adapter: Phoenix.PubSub.PG2],
18+
pubsub_server: CF.Graphql.PubSub,
1919
server: true
2020

2121
# Configures Elixir's Logger

apps/cf_graphql/lib/application.ex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ defmodule CF.Graphql.Application do
88

99
# Define workers and child supervisors to be supervised
1010
children = [
11+
# Start the PubSub system
12+
{Phoenix.PubSub, name: CF.Graphql.PubSub},
1113
# Start the endpoint when the application starts
1214
supervisor(CF.GraphQLWeb.Endpoint, [])
1315
]

apps/cf_graphql/mix.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ defmodule CF.Graphql.Mixfile do
3232

3333
defp deps do
3434
[
35-
{:phoenix, "~> 1.4.18"},
35+
{:phoenix, "~> 1.5.14"},
3636
{:plug, "~> 1.7"},
37-
{:phoenix_pubsub, "~> 1.0"},
37+
{:phoenix_pubsub, "~> 2.0"},
3838
{:cowboy, "~> 2.0"},
3939
{:corsica, "~> 2.1"},
4040
{:absinthe_ecto, "~> 0.1.3"},

apps/cf_graphql/test/support/conn_case.ex

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ defmodule CF.Graphql.ConnCase do
33
This module defines the test case to be used by
44
tests that require setting up a connection.
55
6-
Such tests rely on `Phoenix.ConnTest` and also
7-
import other functionality to make it easier
8-
to build common datastructures and query the data layer.
9-
106
Finally, if the test case interacts with the database,
117
it cannot be async. For this reason, every test runs
128
inside a transaction which is reset at the beginning
@@ -18,7 +14,8 @@ defmodule CF.Graphql.ConnCase do
1814
using do
1915
quote do
2016
# Import conveniences for testing with connections
21-
use Phoenix.ConnTest
17+
import Plug.Conn
18+
import Phoenix.ConnTest
2219
import CF.GraphQLWeb.Router.Helpers
2320

2421
# The default endpoint for testing

apps/cf_rest_api/config/config.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config :cf_rest_api,
77
config :cf_rest_api, CF.RestApi.Endpoint,
88
url: [host: "localhost"],
99
render_errors: [view: CF.RestApi.ErrorView, accepts: ~w(json), default_format: "json"],
10-
pubsub: [name: CF.RestApi.PubSub, adapter: Phoenix.PubSub.PG2],
10+
pubsub_server: CF.RestApi.PubSub,
1111
server: true
1212

1313
# Configure Postgres pool size

apps/cf_rest_api/lib/application.ex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ defmodule CF.RestApi.Application do
66

77
# Define workers and child supervisors to be supervised
88
children = [
9+
# Start the PubSub system
10+
{Phoenix.PubSub, name: CF.RestApi.PubSub},
911
# Start the endpoint when the application starts
1012
supervisor(CF.RestApi.Endpoint, []),
1113
# Presence to track number of connected users to a channel

0 commit comments

Comments
 (0)