Merge pull request #3804 from consul/bump_ckeditor

Bump ckeditor from 4.2.4 to 4.3.0
consuldemocracy · Nov 7, 2019 · 52d165b · 52d165b
2 parents a5cf7c6 + ec1502e
commit 52d165b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem "audited", "~> 4.9.0"
 gem "autoprefixer-rails", "~> 8.2.0"
 gem "browser", "~> 2.5.3"
 gem "cancancan", "~> 2.3.0"
-gem "ckeditor", "~> 4.2.3"
+gem "ckeditor", "~> 4.3.0"
 gem "cocoon", "~> 1.2.9"
 gem "daemons", "~> 1.2.4"
 gem "dalli", "~> 2.7.6"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -129,9 +129,9 @@ GEM
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
-    ckeditor (4.2.4)
-      cocaine
+    ckeditor (4.3.0)
       orm_adapter (~> 0.5.0)
+      terrapin
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
@@ -532,6 +532,8 @@ GEM
       tins (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
@@ -595,7 +597,7 @@ DEPENDENCIES
   capistrano3-puma (~> 4.0.0)
   capybara (~> 2.17.0)
   capybara-webmock (~> 0.5.3)
-  ckeditor (~> 4.2.3)
+  ckeditor (~> 4.3.0)
   cocoon (~> 1.2.9)
   coveralls (~> 0.8.22)
   daemons (~> 1.2.4)

diff --git a/config/initializers/ckeditor.rb b/config/initializers/ckeditor.rb
@@ -8,5 +8,7 @@
   config.authorize_with :cancan
 
   config.assets_languages = Rails.application.config.i18n.available_locales.map { |l| l.to_s.downcase }
-  config.assets_plugins = %w[copyformatting image link magicline scayt table tableselection wsc]
+  config.assets_plugins = %w[balloonpanel balloontoolbar copyformatting image
+                             link magicline scayt table tableselection wsc]
+  config.assets.reject! { |asset| asset =~ /\Ackeditor\/samples\// }
 end