Merge pull request #2228 from asalani93/as-fix-ckey

Colorpicker thing
engaging-computing · Jul 16, 2015 · 0e3d52a · 0e3d52a
2 parents 73ce120 + 3f7cf88
commit 0e3d52a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,7 +35,7 @@ end
 
 # Jquery stuff
 gem 'better_datetimepicker', '~> 0.0.8', git: 'https://github.com/isenseDev/better-datetimepicker'
-gem 'better_colorpicker', '~> 0.1.0', git: 'https://github.com/isenseDev/better-colorpicker'
+gem 'better_colorpicker', '~> 0.1.2', git: 'https://github.com/isenseDev/better-colorpicker'
 gem 'jquery-rails'
 
 # To use ActiveModel has_secure_password

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -22,9 +22,9 @@ GIT
 
 GIT
   remote: https://github.com/isenseDev/better-colorpicker
-  revision: 1e42c14b48c79e1b143dce7c80416a5efbfcc49e
+  revision: 55c4ae1819bdae7b85a0281b4055a6359c2bf91c
   specs:
-    better_colorpicker (0.1.0)
+    better_colorpicker (0.1.1)
       coffee-rails
       coffee-rails-source-maps
       rails (~> 4)
@@ -249,7 +249,7 @@ PLATFORMS
 DEPENDENCIES
   auto_html
   bcrypt-ruby
-  better_colorpicker (~> 0.1.0)!
+  better_colorpicker (~> 0.1.1)!
   better_datetimepicker (~> 0.0.8)!
   bootstrap-sass
   browser