Gemfile.lock in app_frame-0.5.5 vs Gemfile.lock in app_frame-0.5.6
- old
+ new
@@ -1,139 +1,170 @@
GIT
remote: git://github.com/ryanb/nested_form.git
- revision: 8655e352c8f8dd26a6918e72f6d152954b65676a
+ revision: 42028bc06e72a848d297edc1467a969a7c9def57
specs:
- nested_form (0.3.1)
+ nested_form (0.3.2)
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.13)
- actionpack (= 3.2.13)
- mail (~> 2.5.3)
- actionpack (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
+ actionmailer (3.2.14)
+ actionpack (= 3.2.14)
+ mail (~> 2.5.4)
+ actionpack (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.13)
- activesupport (= 3.2.13)
+ activemodel (3.2.14)
+ activesupport (= 3.2.14)
builder (~> 3.0.0)
- activerecord (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
+ activerecord (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
- activesupport (3.2.13)
- i18n (= 0.6.1)
+ activeresource (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
+ activesupport (3.2.14)
+ i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
+ addressable (2.3.5)
arel (3.0.2)
- bcrypt-ruby (3.0.1)
- bootstrap-sass (2.3.1.0)
+ bcrypt-ruby (3.1.1)
+ bootstrap-sass (2.3.2.1)
sass (~> 3.2)
builder (3.0.4)
- devise (2.2.3)
+ devise (3.0.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
- railties (~> 3.1)
- warden (~> 1.2.1)
- diff-lcs (1.1.3)
+ railties (>= 3.2.6, < 5)
+ warden (~> 1.2.3)
+ diff-lcs (1.2.4)
display_for (0.1.12)
erubis (2.7.0)
- git (1.2.5)
- haml (3.1.7)
- haml-rails (0.3.5)
+ faraday (0.8.8)
+ multipart-post (~> 1.2.0)
+ git (1.2.6)
+ github_api (0.10.1)
+ addressable
+ faraday (~> 0.8.1)
+ hashie (>= 1.2)
+ multi_json (~> 1.4)
+ nokogiri (~> 1.5.2)
+ oauth2
+ haml (4.0.3)
+ tilt
+ haml-rails (0.4)
actionpack (>= 3.1, < 4.1)
activesupport (>= 3.1, < 4.1)
- haml (~> 3.1)
+ haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
- has_scope (0.5.1)
- hike (1.2.1)
- i18n (0.6.1)
- inherited_resources (1.3.1)
- has_scope (~> 0.5.0)
- responders (~> 0.6)
- jeweler (1.8.4)
+ has_scope (0.6.0.rc)
+ actionpack (>= 3.2, < 5)
+ activesupport (>= 3.2, < 5)
+ hashie (2.0.5)
+ highline (1.6.19)
+ hike (1.2.3)
+ httpauth (0.2.0)
+ i18n (0.6.5)
+ inherited_resources (1.4.1)
+ has_scope (~> 0.6.0.rc)
+ responders (~> 1.0.0.rc)
+ jeweler (1.8.7)
+ builder
bundler (~> 1.0)
git (>= 1.2.5)
+ github_api (= 0.10.1)
+ highline (>= 1.6.15)
+ nokogiri (= 1.5.10)
rake
rdoc
journey (1.0.4)
- json (1.7.7)
+ json (1.8.0)
+ jwt (0.1.8)
+ multi_json (>= 1.5)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
log_buddy (0.7.0)
- mail (2.5.3)
- i18n (>= 0.4.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.21)
- multi_json (1.7.1)
+ mime-types (1.24)
+ multi_json (1.7.9)
+ multi_xml (0.5.5)
+ multipart-post (1.2.0)
nested_set (1.7.1)
activerecord (>= 3.0.0)
railties (>= 3.0.0)
+ nokogiri (1.5.10)
+ oauth2 (0.9.2)
+ faraday (~> 0.8)
+ httpauth (~> 0.2)
+ jwt (~> 0.1.4)
+ multi_json (~> 1.0)
+ multi_xml (~> 0.5)
+ rack (~> 1.2)
orm_adapter (0.4.0)
- polyamorous (0.5.0)
- activerecord (~> 3.0)
+ polyamorous (0.6.3)
+ activerecord (>= 3.0)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.13)
- actionmailer (= 3.2.13)
- actionpack (= 3.2.13)
- activerecord (= 3.2.13)
- activeresource (= 3.2.13)
- activesupport (= 3.2.13)
+ rails (3.2.14)
+ actionmailer (= 3.2.14)
+ actionpack (= 3.2.14)
+ activerecord (= 3.2.14)
+ activeresource (= 3.2.14)
+ activesupport (= 3.2.14)
bundler (~> 1.0)
- railties (= 3.2.13)
- railties (3.2.13)
- actionpack (= 3.2.13)
- activesupport (= 3.2.13)
+ railties (= 3.2.14)
+ railties (3.2.14)
+ actionpack (= 3.2.14)
+ activesupport (= 3.2.14)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
+ rake (10.1.0)
rdoc (3.12.2)
json (~> 1.4)
- responders (0.9.3)
- railties (~> 3.1)
- rspec-core (2.12.2)
- rspec-expectations (2.12.1)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.2)
- rspec-rails (2.12.2)
+ responders (1.0.0.rc)
+ railties (>= 3.2, < 5)
+ rspec-core (2.14.5)
+ rspec-expectations (2.14.2)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.14.3)
+ rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 2.12.0)
- rspec-expectations (~> 2.12.0)
- rspec-mocks (~> 2.12.0)
- sass (3.2.5)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ sass (3.2.10)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- select2-rails (3.3.1)
- sass-rails (>= 3.2)
+ select2-rails (3.4.8)
+ sass-rails
thor (~> 0.14)
settingslogic (2.0.9)
- simple_form (2.0.4)
+ simple_form (2.1.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
@@ -141,38 +172,38 @@
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- squeel (1.0.18)
- activerecord (~> 3.0)
- activesupport (~> 3.0)
- polyamorous (~> 0.5.0)
- thor (0.17.0)
- tilt (1.3.6)
- treetop (1.4.12)
+ squeel (1.1.0)
+ activerecord (>= 3.0)
+ activesupport (>= 3.0)
+ polyamorous (~> 0.6.0)
+ thor (0.18.1)
+ tilt (1.4.1)
+ treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
- warden (1.2.1)
+ warden (1.2.3)
rack (>= 1.0)
PLATFORMS
ruby
DEPENDENCIES
- bootstrap-sass (~> 2.3.1.0)
+ bootstrap-sass (~> 2.3.2.1)
bundler (~> 1.3.4)
devise
display_for (= 0.1.12)
haml-rails
inherited_resources
- jeweler (~> 1.8.4)
+ jeweler (~> 1.8.7)
kaminari
log_buddy
nested_form!
nested_set
- rails (~> 3.2.13)
+ rails (~> 3.2.14)
rspec-rails
sass-rails
select2-rails
settingslogic
simple_form