Gemfile.lock in trusty-layouts-extension-2.0.2 vs Gemfile.lock in trusty-layouts-extension-2.0.3
- old
+ new
@@ -1,74 +1,72 @@
PATH
remote: .
specs:
- trusty-layouts-extension (2.0.2)
- trusty-cms (~> 2.0.0)
+ trusty-layouts-extension (2.0.3)
+ trusty-cms (~> 2.0.16)
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (4.2.3)
- actionpack (= 4.2.3)
- actionview (= 4.2.3)
- activejob (= 4.2.3)
+ actionmailer (4.2.6)
+ actionpack (= 4.2.6)
+ actionview (= 4.2.6)
+ activejob (= 4.2.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.3)
- actionview (= 4.2.3)
- activesupport (= 4.2.3)
+ actionpack (4.2.6)
+ actionview (= 4.2.6)
+ activesupport (= 4.2.6)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.3)
- activesupport (= 4.2.3)
+ actionview (4.2.6)
+ activesupport (= 4.2.6)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (4.2.3)
- activesupport (= 4.2.3)
+ activejob (4.2.6)
+ activesupport (= 4.2.6)
globalid (>= 0.3.0)
- activemodel (4.2.3)
- activesupport (= 4.2.3)
+ activemodel (4.2.6)
+ activesupport (= 4.2.6)
builder (~> 3.1)
- activerecord (4.2.3)
- activemodel (= 4.2.3)
- activesupport (= 4.2.3)
+ activerecord (4.2.6)
+ activemodel (= 4.2.6)
+ activesupport (= 4.2.6)
arel (~> 6.0)
- activesupport (4.2.3)
+ activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- acts_as_tree (2.2.0)
+ acts_as_tree (2.4.0)
activerecord (>= 3.0.0)
- addressable (2.3.8)
+ addressable (2.4.0)
arel (6.0.3)
builder (3.2.2)
- byebug (5.0.0)
- columnize (= 0.9.0)
+ byebug (8.2.2)
capybara (2.3.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- chunky_png (1.3.4)
- ckeditor (4.1.3)
+ chunky_png (1.3.5)
+ ckeditor (4.1.6)
cocaine
orm_adapter (~> 0.5.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cliver (0.3.2)
- cocaine (0.5.7)
+ cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
- coderay (1.1.0)
- columnize (0.9.0)
+ coderay (1.1.1)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
@@ -77,22 +75,22 @@
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
- compass-rails (2.0.3)
+ compass-rails (2.0.5)
compass (~> 1.0.0)
- sass-rails (<= 5.0.1)
+ sass-rails (< 5.1)
sprockets (< 2.13)
daemons (1.2.3)
database_cleaner (1.3.0)
delocalize (0.4.0)
rails (>= 3.0)
diff-lcs (1.2.5)
erubis (2.7.0)
- eventmachine (1.0.8)
- execjs (2.5.2)
+ eventmachine (1.0.9.1)
+ execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
@@ -105,87 +103,87 @@
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
- highline (1.7.3)
+ highline (1.7.8)
hike (1.2.3)
html2haml (2.0.0)
erubis (~> 2.7.0)
haml (~> 4.0.0)
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
i18n (0.7.0)
- jquery-rails (3.1.3)
+ jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
launchy (2.4.3)
addressable (~> 2.3)
- libv8 (3.16.14.11)
- loofah (2.0.2)
+ libv8 (3.16.14.13)
+ loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
- mime-types (2.6.1)
- mini_portile (0.6.2)
- minitest (5.8.0)
+ mime-types (2.99.1)
+ mini_portile2 (2.0.0)
+ minitest (5.8.4)
multi_json (1.11.2)
- mysql (2.9.1)
- nokogiri (1.6.6.2)
- mini_portile (~> 0.6.0)
+ mysql2 (0.4.3)
+ nokogiri (1.6.7.2)
+ mini_portile2 (~> 2.0.0.rc2)
orm_adapter (0.5.0)
poltergeist (1.5.1)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
protected_attributes (1.0.9)
activemodel (>= 4.0.1, < 5.0)
- pry (0.10.1)
+ pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
- pry-byebug (3.2.0)
- byebug (~> 5.0)
+ pry-byebug (3.3.0)
+ byebug (~> 8.0)
pry (~> 0.10)
rack (1.6.4)
- rack-cache (1.2)
+ rack-cache (1.6.1)
rack (>= 0.4)
rack-test (0.6.3)
rack (>= 1.0)
radius (0.7.4)
- rails (4.2.3)
- actionmailer (= 4.2.3)
- actionpack (= 4.2.3)
- actionview (= 4.2.3)
- activejob (= 4.2.3)
- activemodel (= 4.2.3)
- activerecord (= 4.2.3)
- activesupport (= 4.2.3)
+ rails (4.2.6)
+ actionmailer (= 4.2.6)
+ actionpack (= 4.2.6)
+ actionview (= 4.2.6)
+ activejob (= 4.2.6)
+ activemodel (= 4.2.6)
+ activerecord (= 4.2.6)
+ activesupport (= 4.2.6)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.3)
+ railties (= 4.2.6)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.6)
+ rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.2)
+ rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
- railties (4.2.3)
- actionpack (= 4.2.3)
- activesupport (= 4.2.3)
+ railties (4.2.6)
+ actionpack (= 4.2.6)
+ activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.4.2)
- rb-fsevent (0.9.5)
- rb-inotify (0.9.5)
+ rake (11.1.0)
+ rb-fsevent (0.9.7)
+ rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
ref (2.0.0)
rspec-core (3.0.4)
@@ -202,42 +200,42 @@
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.4)
- ruby_parser (3.7.1)
+ ruby_parser (3.8.1)
sexp_processor (~> 4.1)
- sass (3.4.16)
- sass-rails (5.0.1)
+ sass (3.4.21)
+ sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
- tilt (~> 1.1)
- sexp_processor (4.6.0)
+ tilt (>= 1.1, < 3)
+ sexp_processor (4.7.0)
slop (3.6.0)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.3.2)
+ sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
stringex (1.5.1)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
- thin (1.6.3)
+ thin (1.6.4)
daemons (~> 1.0, >= 1.0.9)
- eventmachine (~> 1.0)
+ eventmachine (~> 1.0, >= 1.0.4)
rack (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
- trusty-cms (2.0.11)
+ trusty-cms (2.0.16)
RedCloth (~> 4.2)
acts_as_tree (~> 2.1)
bundler (~> 1.7)
ckeditor (~> 4.1)
compass-rails (~> 2.0)
@@ -245,11 +243,11 @@
execjs (~> 2.2)
haml (~> 4.0)
haml-rails (~> 0.5)
highline (~> 1.6)
jquery-rails (~> 3.1)
- mysql (~> 2.9)
+ mysql2 (~> 0.4.2)
protected_attributes (~> 1.0.9)
rack (~> 1.4)
rack-cache (~> 1.2)
radius (~> 0.7)
rails (~> 4.2)
@@ -261,17 +259,17 @@
will_paginate (~> 3.0)
trustygems (0.2.1)
rake
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uglifier (2.7.1)
+ uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
- websocket-driver (0.6.2)
+ websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
- will_paginate (3.0.7)
+ will_paginate (3.1.0)
xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS
ruby
@@ -290,5 +288,8 @@
rails-observers
rspec-rails (~> 3.0.0)
thin (~> 1.6.2)
trusty-layouts-extension!
trustygems (~> 0.2.0)
+
+BUNDLED WITH
+ 1.11.2