diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-20 10:33:24 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-20 10:33:24 +0200 |
| commit | df150da4355bb224913f6de2940c9135714fb53f (patch) | |
| tree | 0301dfdea48280c3942fc00da2d478f9360c148c | |
| parent | 1d40325e7c9f8f380d4bb2ac55beedfb1bef5009 (diff) | |
| parent | 97af209c3113926534fe8c5adb7ad51fa4527cbe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/initializers/content_security_policy.rb (took our version)
| -rw-r--r-- | app/models/tag.rb | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/models/tag.rb b/app/models/tag.rb index 5094d973d..945e3a3c6 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -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? diff --git a/package.json b/package.json index 6bbe87f11..6f6730b9a 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "react-notification": "^6.8.4", "react-overlays": "^0.8.3", "react-redux": "^7.1.0", - "react-redux-loading-bar": "^4.4.0", + "react-redux-loading-bar": "^4.0.8", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", "react-select": "^2.4.4", diff --git a/yarn.lock b/yarn.lock index 931d53cad..ecc4e317c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8531,10 +8531,10 @@ react-overlays@^0.8.3: react-transition-group "^2.2.0" warning "^3.0.0" -react-redux-loading-bar@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.4.0.tgz#630f1e3ada7a15d461021d58d8ea935901dba104" - integrity sha512-kcR+wT2eA3+bQD7Gpn7KcHcnANHkayLQGiePEU4JFnLq6sQqjlcE3n8DAUEGjTV+T+Gwlt3rMq/zfImq5yc0PA== +react-redux-loading-bar@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.0.8.tgz#e84d59d1517b79f53b0f39c8ddb40682af648c1b" + integrity sha512-BpR1tlYrYKFtGhxa7nAKc0dpcV33ZgXJ/jKNLpDDaxu2/cCxbkWQt9YlWT+VLw1x/7qyNYY4DH48bZdtmciSpg== dependencies: prop-types "^15.6.2" react-lifecycles-compat "^3.0.2" |