tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)
This commit is contained in:
Thibaut Girka
2019-08-20 10:33:24 +02:00
parent 1d40325e7c 97af209c31
commit df150da435
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/tag.rb
View File

@ -114,7 +114,7 @@ class Tag < ApplicationRecord
class << self
def find_or_create_by_names(name_or_names)
Array(name_or_names).map(&method(:normalize)).uniq { |str| str.mb_chars.downcase.to_s }.map do |normalized_name|
tag = matching_name(normalized_name).first || create(name: normalized_name)
tag = matching_name(normalized_name).first || create!(name: normalized_name)
yield tag if block_given?