Permalink
Browse files

Update CKeditor to 4.0.x

  • Loading branch information...
1 parent 5cfc6c6 commit 8967df376d99e7b01e845d2fc3f97a53454789ce @peakpg peakpg committed Feb 14, 2013
Showing with 12 additions and 13 deletions.
  1. +11 −12 Gemfile.lock
  2. +1 −1 browsercms.gemspec
View
@@ -4,7 +4,7 @@ PATH
browsercms (4.0.0.a)
ancestry (~> 1.2.4)
bootstrap-sass
- ckeditor_rails (~> 3.6.4)
+ ckeditor_rails (~> 4.0.1.1)
jquery-rails (~> 2.0)
paperclip (~> 3.0.3)
rails (>= 3.2.5, < 3.3.0)
@@ -62,9 +62,8 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
- ckeditor_rails (3.6.4.1)
- railties (~> 3.0)
- thor (~> 0.14)
+ ckeditor_rails (4.0.1.1)
+ railties (>= 3.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.1)
@@ -96,10 +95,10 @@ GEM
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.2.0)
+ jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.5)
+ json (1.7.7)
launchy (2.1.2)
addressable (~> 2.3)
libwebsocket (0.1.6.1)
@@ -120,7 +119,7 @@ GEM
rails (~> 3.0)
mocha (0.13.0)
metaclass (~> 0.0.1)
- multi_json (1.3.7)
+ multi_json (1.6.0)
mysql2 (0.3.11)
nokogiri (1.5.5)
paperclip (3.0.4)
@@ -130,10 +129,10 @@ GEM
cocaine (>= 0.0.2)
mime-types
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -152,8 +151,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.5)
- rdoc (3.12)
+ rake (0.9.6)
+ rdoc (3.12.1)
json (~> 1.4)
rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
@@ -182,7 +181,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.16.0)
+ thor (0.17.0)
tilt (1.3.3)
treetop (1.4.12)
polyglot
View
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
s.add_dependency("sass-rails")
s.add_dependency("bootstrap-sass")
s.add_dependency("ancestry", "~> 1.2.4")
- s.add_dependency("ckeditor_rails", "~> 3.6.4")
+ s.add_dependency("ckeditor_rails", "~> 4.0.1.1")
s.add_dependency("jquery-rails", "~> 2.0")
s.add_dependency("paperclip", "~> 3.0.3")

0 comments on commit 8967df3

Please sign in to comment.