57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
diff --git a/Gemfile b/Gemfile
|
|
index 5443374..31e1db6 100644
|
|
--- a/Gemfile
|
|
+++ b/Gemfile
|
|
@@ -181,6 +181,9 @@ gem "underscore-rails", "~> 1.4.4"
|
|
# Sanitize user input
|
|
gem "sanitize", '~> 2.0'
|
|
|
|
+# The newer revision of charlock_holmes that is finally fixed to be compatible with Gentoo
|
|
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
|
|
+
|
|
# Protect against bruteforcing
|
|
gem "rack-attack", '~> 4.3.0'
|
|
|
|
@@ -190,9 +193,6 @@ gem 'ace-rails-ap', '~> 2.0.1'
|
|
# Keyboard shortcuts
|
|
gem 'mousetrap-rails', '~> 1.4.6'
|
|
|
|
-# Detect and convert string character encoding
|
|
-gem 'charlock_holmes', '~> 0.6.9.4'
|
|
-
|
|
gem "sass-rails", '~> 4.0.5'
|
|
gem "coffee-rails", '~> 4.1.0'
|
|
gem "uglifier", '~> 2.3.2'
|
|
diff --git a/Gemfile.lock b/Gemfile.lock
|
|
index 3c16251..960effc 100644
|
|
--- a/Gemfile.lock
|
|
+++ b/Gemfile.lock
|
|
@@ -1,3 +1,10 @@
|
|
+GIT
|
|
+ remote: https://github.com/brianmario/charlock_holmes.git
|
|
+ revision: dde194609b3513b0d2369ce8f916ae52566154b4
|
|
+ ref: dde194609b3513b0d2369ce8f916ae52566154b4
|
|
+ specs:
|
|
+ charlock_holmes (0.6.9.4)
|
|
+
|
|
GEM
|
|
remote: https://rubygems.org/
|
|
specs:
|
|
@@ -101,7 +108,6 @@ GEM
|
|
json (>= 1.7)
|
|
celluloid (0.16.0)
|
|
timers (~> 4.0.0)
|
|
- charlock_holmes (0.6.9.4)
|
|
chronic (0.10.2)
|
|
chunky_png (1.3.4)
|
|
cliver (0.3.2)
|
|
@@ -802,7 +808,7 @@ DEPENDENCIES
|
|
capybara (~> 2.4.0)
|
|
capybara-screenshot (~> 1.0.0)
|
|
carrierwave (~> 0.9.0)
|
|
- charlock_holmes (~> 0.6.9.4)
|
|
+ charlock_holmes!
|
|
coffee-rails (~> 4.1.0)
|
|
colored (~> 1.2)
|
|
colorize (~> 0.5.8)
|