update trix editor to 0.10.1

in order to fix #305. See also: #305 maclover7/trix#35
ivaldi · Feb 6, 2017 · 81d319f · 81d319f
1 parent af47a52
commit 81d319f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -92,7 +92,7 @@ gem 'gravatar_image_tag', "~> 1.2"
 gem 'recaptcha', "~> 4.0", require: 'recaptcha/rails'
 
 # Trix WYSIWYG editor
-gem 'trix', "~> 0.9"
+gem 'trix', "~> 0.10", ">= 0.10.1"
 
 # React support
 gem 'react-rails', "~> 1.10"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -263,7 +263,7 @@ GEM
     tilt (2.0.5)
     timecop (0.8.1)
     tins (1.13.0)
-    trix (0.9.10)
+    trix (0.10.1)
       rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -314,9 +314,9 @@ DEPENDENCIES
   spring (~> 2.0)
   sqlite3 (~> 1.3)
   timecop (~> 0.8)
-  trix (~> 0.9)
+  trix (~> 0.10, >= 0.10.1)
   uglifier (~> 3.0.0)
   will_paginate (~> 3.1)
 
 BUNDLED WITH
-   1.13.6
+   1.13.7