Gemfile.lock in brightcontent-pages-2.0.30 vs Gemfile.lock in brightcontent-pages-2.0.31
- old
+ new
@@ -1,32 +1,32 @@
PATH
remote: .
specs:
- brightcontent-pages (2.0.30)
+ brightcontent-pages (2.0.31)
awesome_nested_set
- brightcontent-attachments (= 2.0.30)
- brightcontent-core (= 2.0.30)
+ brightcontent-attachments (= 2.0.31)
+ brightcontent-core (= 2.0.31)
the_sortable_tree (~> 2.3.0)
PATH
remote: ../attachments
specs:
- brightcontent-attachments (2.0.30)
- brightcontent-core (= 2.0.30)
+ brightcontent-attachments (2.0.31)
+ brightcontent-core (= 2.0.31)
jquery-fileupload-rails
paperclip
PATH
remote: ../core
specs:
- brightcontent-core (2.0.30)
- bcrypt-ruby
+ brightcontent-core (2.0.31)
+ bcrypt-ruby (= 3.0.0)
bootstrap-wysihtml5-rails
has_scope
inherited_resources
jquery-rails
- rails (~> 3.2.9)
+ rails (~> 3.2.13)
simple_form
strong_parameters
will_paginate
GEM
@@ -57,65 +57,61 @@
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
- addressable (2.3.3)
+ addressable (2.3.5)
arel (3.0.2)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
- bcrypt-ruby (3.0.1)
- bootstrap-wysihtml5-rails (0.3.1.19)
+ bcrypt-ruby (3.0.0)
+ bootstrap-wysihtml5-rails (0.3.1.20)
railties (>= 3.0)
builder (3.0.4)
- capybara (2.0.2)
+ capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 1.0.0)
- childprocess (0.3.9)
- ffi (~> 1.0, >= 1.0.11)
+ xpath (~> 2.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.1)
climate_control (>= 0.0.3, < 1.0)
- diff-lcs (1.2.1)
+ diff-lcs (1.2.4)
erubis (2.7.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- ffi (1.5.0)
has_scope (0.5.1)
- hike (1.2.1)
+ hike (1.2.3)
i18n (0.6.1)
- inherited_resources (1.3.1)
+ inherited_resources (1.4.0)
has_scope (~> 0.5.0)
- responders (~> 0.6)
+ responders (~> 0.9)
journey (1.0.4)
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
- jquery-rails (2.2.1)
+ jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.7)
- launchy (2.2.0)
+ json (1.8.0)
+ launchy (2.3.0)
addressable (~> 2.3)
- 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.2)
- nokogiri (1.5.9)
- paperclip (3.4.1)
+ mime-types (1.23)
+ mini_portile (0.5.1)
+ multi_json (1.7.7)
+ nokogiri (1.6.0)
+ mini_portile (~> 0.5.0)
+ paperclip (3.5.0)
activemodel (>= 3.0.0)
- activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.0)
mime-types
polyglot (0.3.3)
rack (1.4.5)
@@ -138,55 +134,48 @@
activesupport (= 3.2.13)
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.13.1)
- rspec-expectations (2.13.0)
+ rspec-core (2.14.3)
+ rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.13.0)
- rspec-rails (2.13.0)
+ rspec-mocks (2.14.1)
+ rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 2.13.0)
- rspec-expectations (~> 2.13.0)
- rspec-mocks (~> 2.13.0)
- rubyzip (0.9.9)
- selenium-webdriver (2.31.0)
- childprocess (>= 0.2.5)
- multi_json (~> 1.0)
- rubyzip
- websocket (~> 1.0.4)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
simple_form (2.1.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
- strong_parameters (0.2.0)
+ strong_parameters (0.2.1)
actionpack (~> 3.0)
activemodel (~> 3.0)
railties (~> 3.0)
- the_sortable_tree (2.3.0)
+ the_sortable_tree (2.3.3)
rails (>= 3.1)
- thor (0.17.0)
- tilt (1.3.6)
- treetop (1.4.12)
+ thor (0.18.1)
+ tilt (1.4.1)
+ treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
- websocket (1.0.7)
will_paginate (3.0.4)
- xpath (1.0.0)
+ xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS
ruby