diff --git a/Gemfile.lock b/Gemfile.lock index b045e39..c3f6d99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - angularjs-rails (1.3.3) + angularjs-rails (1.3.4) arel (5.0.1.20140414130214) bson (2.3.0) builder (3.2.2) @@ -49,7 +49,7 @@ GEM celluloid (0.16.0) timers (~> 4.0.0) chunky_png (1.3.3) - codeclimate-test-reporter (0.4.1) + codeclimate-test-reporter (0.4.3) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) coffee-rails (4.1.0) @@ -82,7 +82,7 @@ GEM foundation-rails (5.4.5.0) railties (>= 3.1.0) sass (>= 3.2.0) - guard (2.8.2) + guard (2.10.1) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) @@ -93,9 +93,9 @@ GEM guard (~> 2.2) guard-rails (0.7.0) guard (~> 2.0) - guard-rspec (4.3.1) + guard-rspec (4.4.1) guard (~> 2.1) - rspec (>= 2.14, < 4.0) + rspec (>= 2.99.0, < 4.0) hike (1.2.3) hitimes (1.2.2) html_truncator (0.4.0) @@ -106,7 +106,7 @@ GEM thor (>= 0.14, < 2.0) json (1.8.1) kgio (2.9.2) - listen (2.8.1) + listen (2.8.3) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -138,9 +138,9 @@ GEM connection_pool (~> 2.0) optionable (~> 0.2.0) multi_json (1.10.1) - netrc (0.8.0) - newrelic_rpm (3.9.7.266) - nokogiri (1.6.4.1) + netrc (0.9.0) + newrelic_rpm (3.9.8.273) + nokogiri (1.6.5) mini_portile (~> 0.6.0) optionable (0.2.0) origin (2.1.1) @@ -173,11 +173,11 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (10.3.2) + rake (10.4.2) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.0) + redcarpet (3.2.1) redis (3.1.0) redis-namespace (1.5.1) redis (~> 3.0, >= 3.0.4) @@ -211,10 +211,10 @@ GEM sidekiq (>= 2.4.0) rspec-support (3.1.2) sass (3.2.19) - sass-rails (4.0.4) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) sass (~> 3.2.2) - sprockets (~> 2.8, < 2.12) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) sidekiq (3.3.0) celluloid (>= 0.16.0) @@ -222,7 +222,7 @@ GEM json redis (>= 3.0.6) redis-namespace (>= 1.3.1) - simple_form (3.0.2) + simple_form (3.1.0) actionpack (~> 4.0) activemodel (~> 4.0) simplecov (0.9.1) @@ -240,12 +240,12 @@ GEM slim (~> 2.0) slop (3.6.0) spring (1.2.0) - sprockets (2.11.3) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.1) + sprockets-rails (2.2.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb index 9bf73ce..bcc449c 100644 --- a/app/controllers/admin/posts_controller.rb +++ b/app/controllers/admin/posts_controller.rb @@ -65,7 +65,7 @@ class Admin::PostsController < ApplicationController end def preview - render :text => Post.render_html(params[:content] || "") + render plain: Post.render_html(params[:content] || "") end private