Permalink
Browse files

Lock datepicker version and change docsplit branch

  • Loading branch information...
1 parent 820986d commit 1a9a72964a8055244f161b1fb005b9f3fee285a9 @augustf augustf committed Feb 18, 2014
Showing with 5 additions and 4 deletions.
  1. +2 −2 Gemfile
  2. +3 −2 Gemfile.lock
View
@@ -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'
View
@@ -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

0 comments on commit 1a9a729

Please sign in to comment.