Merge remote-tracking branch 'philo/1_1_stable'

Author: Meow

docker/web/Dockerfile

@@ -1,9 +1,10 @@
-ARG CADDY_VERSION="2.9.1"
+ARG CADDY_VERSION="2.10.0"
+ARG CADDY_FS_S3_VERSION=v0.10.0
 
 FROM caddy:$CADDY_VERSION-builder-alpine AS builder
 
 RUN xcaddy build \
-    --with github.com/sagikazarmark/caddy-fs-s3
+    --with github.com/sagikazarmark/caddy-fs-s3@${CADDY_FS_S3_VERSION}
 
 FROM caddy:$CADDY_VERSION-alpine
 

lib/philomena_web/controllers/profile/scratchpad_controller.ex

@@ -6,7 +6,12 @@ defmodule PhilomenaWeb.Profile.ScratchpadController do
 
   plug PhilomenaWeb.FilterBannedUsersPlug
   plug PhilomenaWeb.CanaryMapPlug, edit: :index, update: :index
-  plug :load_resource, model: User, id_name: "profile_id", id_field: "slug", persisted: true
+
+  plug :load_and_authorize_resource,
+    model: User,
+    id_name: "profile_id",
+    id_field: "slug",
+    persisted: true
 
   def edit(conn, _params) do
     changeset = Users.change_user(conn.assigns.user)

mix.exs

@@ -4,7 +4,7 @@ defmodule Philomena.MixProject do
   def project do
     [
       app: :philomena,
-      version: "1.1.0",
+      version: "1.1.2",
       elixir: "~> 1.5",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),