Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
This commit is contained in:
Thibaut Girka
2019-08-07 13:56:48 +02:00
42 changed files with 249 additions and 56 deletions

View File

@@ -30,7 +30,7 @@ class DirectoriesController < ApplicationController
end
def set_tag
@tag = Tag.discoverable.find_by!(name: params[:id].downcase)
@tag = Tag.discoverable.find_normalized!(params[:id])
end
def set_tags