Change ckeditor gem and kaminari in gemfile

2013-07-22 17:26:32 +08:00
1 parent 92faeccdb6
commit 6cf249ccfb
@@ -14,7 +14,7 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
+gem 'kaminari'

 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -46,7 +46,7 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'

-gem 'ckeditor_rails'
+gem 'ckeditor'
 # gem 'tinymce-rails', "~> 3.5.8"
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")