github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue #387

This commit is contained in:
did 2012-05-04 03:35:07 -07:00
parent a8646e7ef3
commit 03d13d92d0
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Gemfile.lock
View File

@ -30,6 +30,7 @@ PATH
custom_fields (~> 2.0.0.rc10) custom_fields (~> 2.0.0.rc10)
devise (~> 1.5.3) devise (~> 1.5.3)
dragonfly (~> 0.9.8) dragonfly (~> 0.9.8)
execjs (= 1.3.0)
flash_cookie_session (~> 1.1.1) flash_cookie_session (~> 1.1.1)
fog (~> 1.3.1) fog (~> 1.3.1)
formtastic (~> 2.0.2) formtastic (~> 2.0.2)
@ -88,7 +89,7 @@ GEM
activesupport (3.2.3) activesupport (3.2.3)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.7) addressable (2.2.8)
arel (3.0.2) arel (3.0.2)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bson (1.5.2) bson (1.5.2)
@ -112,7 +113,7 @@ GEM
cells (3.8.3) cells (3.8.3)
actionpack (~> 3.0) actionpack (~> 3.0)
railties (~> 3.0) railties (~> 3.0)
childprocess (0.3.1) childprocess (0.3.2)
ffi (~> 1.0.6) ffi (~> 1.0.6)
chunky_png (1.2.5) chunky_png (1.2.5)
codemirror-rails (2.24) codemirror-rails (2.24)
@ -186,8 +187,8 @@ GEM
jquery-rails (1.0.19) jquery-rails (1.0.19)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.6) json (1.7.0)
json_spec (1.0.0) json_spec (1.0.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rspec (~> 2.0) rspec (~> 2.0)
kaminari (0.13.0) kaminari (0.13.0)
@ -280,23 +281,23 @@ GEM
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.8.0) rspec (~> 2.8.0)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
rubyzip (0.9.7) rubyzip (0.9.8)
sanitize (2.0.3) sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6) nokogiri (>= 1.4.4, < 1.6)
sass (3.1.15) sass (3.1.16)
sass-rails (3.2.5) sass-rails (3.2.5)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
selenium-webdriver (2.21.1) selenium-webdriver (2.21.2)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
ffi (~> 1.0) ffi (~> 1.0)
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)
multi_json (< 1.3) multi_json (~> 1.0)
rubyzip rubyzip
shoulda-matchers (1.1.0) shoulda-matchers (1.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sprockets (2.1.2) sprockets (2.1.3)
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
@ -310,7 +311,7 @@ GEM
uglifier (1.2.4) uglifier (1.2.4)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
unicorn (4.2.1) unicorn (4.3.1)
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)

1
locomotive_cms.gemspec
View File

@ -59,6 +59,7 @@ Gem::Specification.new do |s|
s.add_dependency 'rack-cache', '~> 1.1' s.add_dependency 'rack-cache', '~> 1.1'
s.add_dependency 'mimetype-fu', '~> 0.1.2' s.add_dependency 'mimetype-fu', '~> 0.1.2'
s.add_dependency 'execjs', '1.3.0'
s.add_dependency 'multi_json', '1.2.0' s.add_dependency 'multi_json', '1.2.0'
s.add_dependency 'httparty', '~> 0.8.1' s.add_dependency 'httparty', '~> 0.8.1'
s.add_dependency 'actionmailer-with-request', '~> 0.3.0' s.add_dependency 'actionmailer-with-request', '~> 0.3.0'