Gemfile.lock in trusty-layouts-extension-3.0.0 vs Gemfile.lock in trusty-layouts-extension-3.1.0
- old
+ new
@@ -1,78 +1,71 @@
-GIT
- remote: https://github.com/rails/rails-observers
- revision: 7d3c9c331242d58ed8ebdbd2eff1f7d6f68a1b2c
- specs:
- rails-observers (0.1.3.alpha)
- activemodel (>= 4.0, < 5.1)
-
PATH
remote: .
specs:
- trusty-layouts-extension (3.0.0)
- trusty-cms (~> 3.0.0)
+ trusty-layouts-extension (3.1.0)
+ trusty-cms (~> 3.1.0)
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
- actioncable (5.0.2)
- actionpack (= 5.0.2)
- nio4r (>= 1.2, < 3.0)
+ actioncable (5.1.3)
+ actionpack (= 5.1.3)
+ nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.2)
- actionpack (= 5.0.2)
- actionview (= 5.0.2)
- activejob (= 5.0.2)
+ actionmailer (5.1.3)
+ actionpack (= 5.1.3)
+ actionview (= 5.1.3)
+ activejob (= 5.1.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.2)
- actionview (= 5.0.2)
- activesupport (= 5.0.2)
+ actionpack (5.1.3)
+ actionview (= 5.1.3)
+ activesupport (= 5.1.3)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.2)
- activesupport (= 5.0.2)
+ actionview (5.1.3)
+ activesupport (= 5.1.3)
builder (~> 3.1)
- erubis (~> 2.7.0)
+ erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.2)
- activesupport (= 5.0.2)
+ activejob (5.1.3)
+ activesupport (= 5.1.3)
globalid (>= 0.3.6)
- activemodel (5.0.2)
- activesupport (= 5.0.2)
- activerecord (5.0.2)
- activemodel (= 5.0.2)
- activesupport (= 5.0.2)
- arel (~> 7.0)
- activesupport (5.0.2)
+ activemodel (5.1.3)
+ activesupport (= 5.1.3)
+ activerecord (5.1.3)
+ activemodel (= 5.1.3)
+ activesupport (= 5.1.3)
+ arel (~> 8.0)
+ activesupport (5.1.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_tree (2.6.1)
activerecord (>= 3.0.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
- arel (7.1.4)
+ arel (8.0.0)
builder (3.2.3)
byebug (9.0.6)
capybara (2.13.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chunky_png (1.3.8)
- ckeditor (4.2.3)
+ ckeditor (4.2.4)
cocaine
orm_adapter (~> 0.5.0)
- climate_control (0.1.0)
+ climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1)
compass (1.0.3)
@@ -90,27 +83,30 @@
compass-rails (3.0.2)
compass (~> 1.0.0)
sass-rails (< 5.1)
sprockets (< 4.0)
concurrent-ruby (1.0.5)
+ css_parser (1.5.0)
+ addressable
daemons (1.2.4)
database_cleaner (1.3.0)
delocalize (0.4.0)
rails (>= 3.0)
diff-lcs (1.3)
+ erubi (1.6.1)
erubis (2.7.0)
- eventmachine (1.2.3)
+ eventmachine (1.2.5)
execjs (2.7.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.5.0)
+ factory_girl_rails (4.6.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
ffi (1.9.18)
globalid (0.4.0)
activesupport (>= 4.2.0)
- haml (5.0.1)
+ haml (5.0.2)
temple (>= 0.8.0)
tilt
haml-rails (1.0.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
@@ -121,84 +117,88 @@
html2haml (2.2.0)
erubis (~> 2.7.0)
haml (>= 4.0, < 6)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
- i18n (0.8.1)
+ i18n (0.8.6)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
launchy (2.4.3)
addressable (~> 2.3)
- libv8 (3.16.14.19-x86_64-darwin-16)
+ libv8 (3.16.14.19)
loofah (2.0.3)
nokogiri (>= 1.5.9)
- mail (2.6.5)
+ mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
- mini_portile2 (2.1.0)
- minitest (5.10.1)
+ mini_portile2 (2.2.0)
+ minitest (5.10.3)
multi_json (1.12.1)
- mysql2 (0.4.6)
- nio4r (2.0.0)
- nokogiri (1.7.1)
- mini_portile2 (~> 2.1.0)
+ mysql2 (0.4.8)
+ nio4r (2.1.0)
+ nokogiri (1.8.0)
+ mini_portile2 (~> 2.2.0)
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_continued (1.3.0)
- activemodel (~> 5.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
public_suffix (2.0.5)
- rack (2.0.2)
+ rack (2.0.3)
rack-cache (1.7.0)
rack (>= 0.4)
rack-test (0.6.3)
rack (>= 1.0)
radius (0.7.4)
- rails (5.0.2)
- actioncable (= 5.0.2)
- actionmailer (= 5.0.2)
- actionpack (= 5.0.2)
- actionview (= 5.0.2)
- activejob (= 5.0.2)
- activemodel (= 5.0.2)
- activerecord (= 5.0.2)
- activesupport (= 5.0.2)
- bundler (>= 1.3.0, < 2.0)
- railties (= 5.0.2)
+ rails (5.1.3)
+ actioncable (= 5.1.3)
+ actionmailer (= 5.1.3)
+ actionpack (= 5.1.3)
+ actionview (= 5.1.3)
+ activejob (= 5.1.3)
+ activemodel (= 5.1.3)
+ activerecord (= 5.1.3)
+ activesupport (= 5.1.3)
+ bundler (>= 1.3.0)
+ railties (= 5.1.3)
sprockets-rails (>= 2.0.0)
- rails-dom-testing (2.0.2)
- activesupport (>= 4.2.0, < 6.0)
- nokogiri (~> 1.6)
+ rails-dom-testing (2.0.3)
+ activesupport (>= 4.2.0)
+ nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- railties (5.0.2)
- actionpack (= 5.0.2)
- activesupport (= 5.0.2)
+ railties (5.1.3)
+ actionpack (= 5.1.3)
+ activesupport (= 5.1.3)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.8)
- ffi (>= 0.5.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
rdoc (5.1.0)
ref (2.0.0)
+ roadie (3.2.2)
+ css_parser (~> 1.4)
+ nokogiri (~> 1.5)
+ roadie-rails (1.2.1)
+ railties (>= 3.0, < 5.2)
+ roadie (~> 3.1)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
@@ -212,20 +212,20 @@
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
- ruby_parser (3.9.0)
- sexp_processor (~> 4.1)
- sass (3.4.23)
+ ruby_parser (3.10.1)
+ sexp_processor (~> 4.9)
+ sass (3.4.25)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- sexp_processor (4.9.0)
+ sexp_processor (4.10.0)
slop (3.6.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
@@ -241,12 +241,12 @@
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.19.4)
thread_safe (0.3.6)
- tilt (2.0.7)
- trusty-cms (3.0.0)
+ tilt (2.0.8)
+ trusty-cms (3.1.0)
RedCloth (~> 4.3.2)
acts_as_tree (~> 2.6.1)
bundler (~> 1.7)
ckeditor (~> 4.2.2)
compass-rails (~> 3.0.2)
@@ -258,13 +258,14 @@
jquery-rails (~> 4.3.1)
mysql2 (~> 0.4.2)
rack (~> 2.0.1)
rack-cache (~> 1.7)
radius (~> 0.7)
- rails (~> 5.0.2)
+ rails (~> 5.1)
rake (< 11.0)
rdoc (~> 5.1)
+ roadie-rails (~> 1.2.1)
sass-rails (~> 5.0.6)
stringex (~> 2.7.1)
therubyracer (~> 0.12.3)
tzinfo (~> 1.2.3)
uglifier (~> 3.2)
@@ -276,29 +277,27 @@
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
- will_paginate (3.1.5)
- xpath (2.0.0)
+ will_paginate (3.1.6)
+ xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
capybara (~> 2.13.0)
database_cleaner (~> 1.3.0)
- factory_girl_rails (~> 4.5.0)
+ factory_girl_rails (~> 4.6.0)
launchy (~> 2.4.2)
poltergeist (~> 1.5.1)
- protected_attributes_continued
pry (~> 0.10.0)
pry-byebug
- rails-observers!
rspec-rails
thin (~> 1.6.2)
trusty-layouts-extension!
trustygems (~> 0.2.0)
BUNDLED WITH
- 1.14.5
+ 1.15.3