Browse files

Use new version 1.1.0 of cocoon.

  • Loading branch information...
1 parent 711c154 commit 31691f62f352835e2c7d9ea6da626eeb8f7e5379 Nathan Van der Auwera committed Oct 8, 2012
Showing with 4 additions and 8 deletions.
  1. +2 −2 Gemfile
  2. +2 −6 Gemfile.lock
View
4 Gemfile
@@ -13,8 +13,8 @@ gem 'uglifier'
gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'cocoon', :path => '../cocoon'
-#gem 'cocoon'
+#gem 'cocoon', :path => '../cocoon'
+gem 'cocoon', '~> 1.1.0'
# use master version of simple-form for twitter-bootstrap integration
gem 'simple_form'
View
8 Gemfile.lock
@@ -1,8 +1,3 @@
-PATH
- remote: ../cocoon
- specs:
- cocoon (1.0.22)
-
GEM
remote: http://rubygems.org/
specs:
@@ -35,6 +30,7 @@ GEM
multi_json (~> 1.0)
arel (3.0.2)
builder (3.0.3)
+ cocoon (1.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -136,7 +132,7 @@ PLATFORMS
ruby
DEPENDENCIES
- cocoon!
+ cocoon (~> 1.1.0)
coffee-script
jquery-rails
rails (= 3.2.8)

0 comments on commit 31691f6

Please sign in to comment.