diff --git a/Gemfile.lock b/Gemfile.lock index e198eb4..e911774 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,14 +28,16 @@ GEM activesupport (3.2.6) i18n (~> 0.6) multi_json (~> 1.0) - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.1) bootstrap-sass (2.0.4.0) - builder (3.0.0) + builder (3.0.4) ckeditor (3.7.1) mime-types orm_adapter - cocaine (0.2.1) + climate_control (0.2.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -43,11 +45,13 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) hike (1.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) @@ -62,14 +66,15 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - multi_json (1.3.6) + mimemagic (0.3.0) + multi_json (1.14.0) orm_adapter (0.4.0) - paperclip (3.1.4) - activemodel (>= 3.0.0) - activerecord (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (>= 0.0.2) + paperclip (4.3.7) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types + mimemagic (= 0.3.0) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -111,7 +116,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.55) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3)