Lock datepicker version and change docsplit branch

concerto · Feb 18, 2014 · 1a9a729 · 1a9a729
1 parent 820986d
commit 1a9a729
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -37,7 +37,7 @@ end
 gem 'jquery-rails'
 gem 'turbolinks'
 gem 'bootstrap-datepicker-rails'
-gem 'jquery-timepicker-rails'
+gem 'jquery-timepicker-rails', '1.2.5.0'
 gem 'twitter-bootstrap-rails-confirm'
 
 #RMagick is used for image resizing and processing
@@ -90,4 +90,4 @@ pa_platforms &= Bundler::Dependency::PLATFORM_MAP.keys
 gem 'public_activity', :platforms => pa_platforms
 
 gem 'redcarpet', '~> 2.3.0'
-gem 'docsplit', :git => 'git://github.com/augustf/docsplit.git'
+gem 'docsplit', :git => 'git://github.com/augustf/docsplit.git', :branch => 'imagemagick'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,7 @@
 GIT
   remote: git://github.com/augustf/docsplit.git
-  revision: 22a4d7e5bcb15c3c9a0a01950caaf45010c753d9
+  revision: b988e02903696dd9cde6d6b2b0f975624ea1b96f
+  branch: imagemagick
   specs:
     docsplit (0.7.4)
 
@@ -241,7 +242,7 @@ DEPENDENCIES
   foreman
   girl_friday
   jquery-rails
-  jquery-timepicker-rails
+  jquery-timepicker-rails (= 1.2.5.0)
   json (= 1.7.7)
   kaminari (= 0.14.1)
   mysql2