aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornullkal <nullkal@users.noreply.github.com>2017-08-17 21:46:53 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-08-17 14:46:53 +0200
commit54a04e36587840e330a0a4df7c4e1855a3c92e03 (patch)
treeca2e6453762a64cd6f180578c01d3c3162592c9f
parent462c30e26cab017f185fa1fb464fca7ec73b6da8 (diff)
downloadmastodon-54a04e36587840e330a0a4df7c4e1855a3c92e03.tar
mastodon-54a04e36587840e330a0a4df7c4e1855a3c92e03.tar.gz
mastodon-54a04e36587840e330a0a4df7c4e1855a3c92e03.tar.bz2
mastodon-54a04e36587840e330a0a4df7c4e1855a3c92e03.zip
Update charlock_holmes to 0.7.5 (#4620)
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f4182bff5..52ac43b9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'active_model_serializers', '~> 0.10'
gem 'addressable', '~> 2.5'
gem 'bootsnap'
gem 'browser'
-gem 'charlock_holmes', '~> 0.7.3'
+gem 'charlock_holmes', '~> 0.7.5'
gem 'cld3', '~> 3.1'
gem 'devise', '~> 4.2'
gem 'devise-two-factor', '~> 3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7a4dbab85..9c830a7b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,7 +108,7 @@ GEM
xpath (~> 2.0)
case_transform (0.2)
activesupport
- charlock_holmes (0.7.3)
+ charlock_holmes (0.7.5)
chunky_png (1.3.8)
cld3 (3.1.3)
ffi (>= 1.1.0, < 1.10.0)
@@ -511,7 +511,7 @@ DEPENDENCIES
capistrano-rbenv (~> 2.1)
capistrano-yarn (~> 2.0)
capybara (~> 2.14)
- charlock_holmes (~> 0.7.3)
+ charlock_holmes (~> 0.7.5)
cld3 (~> 3.1)
climate_control (~> 0.2)
devise (~> 4.2)