Compare commits

...

4 Commits

Author SHA1 Message Date
Mark Felder
f0a3bafe84 Revert "Cache gitlab-ci based on mix.lock"
This reverts commit 6e7e8d2f2f.
2021-04-27 16:24:48 -05:00
Mark Felder
ebf24734f6 Senseless commit 2 2021-04-27 16:21:38 -05:00
Mark Felder
b480360ae5 Useless test commit that forces rebuild of 245 files 2021-04-27 16:14:25 -05:00
Alex Gleason
6e7e8d2f2f Cache gitlab-ci based on mix.lock 2021-04-27 15:53:54 -05:00
2 changed files with 2 additions and 2 deletions

View File

@ -17,7 +17,7 @@ defmodule Mix.Pleroma do
:oban :oban
] ]
@cachex_children ["object", "user", "scrubber", "web_resp"] @cachex_children ["object", "user", "scrubber", "web_resp"]
@doc "Common functions to be reused in mix tasks" @doc "Common functions to be reused in mix tasks."
def start_pleroma do def start_pleroma do
Pleroma.Config.Holder.save_default() Pleroma.Config.Holder.save_default()
Pleroma.Config.Oban.warn() Pleroma.Config.Oban.warn()

View File

@ -17,7 +17,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
uri: Pleroma.Web.base_url(), uri: Pleroma.Web.base_url(),
title: Keyword.get(instance, :name), title: Keyword.get(instance, :name),
description: Keyword.get(instance, :description), description: Keyword.get(instance, :description),
version: "#{@mastodon_api_level} (compatible; #{Pleroma.Application.named_version()})", version: "#{@mastodon_api_level} (compatible; #{Pleroma.Application.named_version()}) WHEEEEEE",
email: Keyword.get(instance, :email), email: Keyword.get(instance, :email),
urls: %{ urls: %{
streaming_api: Pleroma.Web.Endpoint.websocket_url() streaming_api: Pleroma.Web.Endpoint.websocket_url()