aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile8
-rw-r--r--Gemfile.lock431
2 files changed, 233 insertions, 206 deletions
diff --git a/Gemfile b/Gemfile
index b098343..454f54f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "http://rubygems.org"
gemspec
-gem 'refinerycms', '~> 2.0.0'
+gem 'refinerycms', '~> 2.1.0'
# Refinery/rails should pull in the proper versions of these
group :assets do
@@ -14,7 +14,7 @@ end
gem 'jquery-rails'
group :development, :test do
- gem 'refinerycms-testing', '~> 2.0.0'
+ gem 'refinerycms-testing', '~> 2.1.0'
gem 'factory_girl_rails'
gem 'generator_spec'
@@ -29,7 +29,7 @@ group :development, :test do
unless defined?(JRUBY_VERSION)
gem 'sqlite3'
- gem 'mysql'
+ gem 'mysql2'
gem 'pg'
end
@@ -40,7 +40,7 @@ group :development, :test do
end
platforms :ruby do
- gem 'spork', '0.9.0.rc9'
+ gem 'spork', '~>0.9.0'
gem 'guard-spork'
unless ENV['TRAVIS']
diff --git a/Gemfile.lock b/Gemfile.lock
index 031a5b2..ce6c024 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,263 +2,285 @@ PATH
remote: .
specs:
refinerycms-pc_banners (2.0.2)
- refinerycms-pages (~> 2.0.1)
+ refinerycms-pages (~> 2.1.0)
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.22.5)
+ actionpack (= 3.2.22.5)
+ mail (~> 2.5.4)
+ actionpack (3.2.22.5)
+ activemodel (= 3.2.22.5)
+ activesupport (= 3.2.22.5)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
- rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ journey (~> 1.0.4)
+ rack (~> 1.4.5)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.22.5)
+ activesupport (= 3.2.22.5)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.22.5)
+ activemodel (= 3.2.22.5)
+ activesupport (= 3.2.22.5)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
- i18n (~> 0.6)
+ activesupport (3.2.22.5)
+ i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
- acts_as_indexed (0.7.7)
- addressable (2.2.7)
- arel (3.0.2)
- awesome_nested_set (2.1.2)
+ acts_as_indexed (0.8.3)
+ arel (3.0.3)
+ awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
- babosa (0.3.5)
- bcrypt-ruby (3.0.1-x86-mingw32)
- builder (3.0.0)
- capybara (1.1.2)
+ babosa (1.0.2)
+ bcrypt (3.1.12)
+ bcrypt (3.1.12-x86-mingw32)
+ bcrypt-ruby (3.1.5)
+ bcrypt (>= 3.1.3)
+ bcrypt-ruby (3.1.5-x86-mingw32)
+ bcrypt (>= 3.1.3)
+ builder (3.0.4)
+ 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 (~> 0.1.4)
- childprocess (0.3.1)
- ffi (~> 1.0.6)
+ xpath (~> 2.0)
+ childprocess (1.0.1)
+ rake (< 13.0)
+ coderay (1.1.2)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
- coffee-script (2.2.0)
+ coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.2.0)
- database_cleaner (0.7.1)
- devise (2.0.4)
+ coffee-script-source (1.12.2)
+ concurrent-ruby (1.1.5)
+ database_cleaner (1.2.0)
+ decorators (1.0.5)
+ railties (>= 3.0.19)
+ devise (2.2.8)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
+ orm_adapter (~> 0.1)
railties (~> 3.1)
- warden (~> 1.1.1)
- diff-lcs (1.1.3)
- dragonfly (0.9.10)
+ warden (~> 1.2.1)
+ diff-lcs (1.3)
+ dragonfly (0.9.15)
+ multi_json (~> 1.0)
rack
erubis (2.7.0)
- execjs (1.3.0)
- multi_json (~> 1.0)
- factory_girl (2.5.2)
- activesupport (>= 2.3.9)
- factory_girl_rails (1.6.0)
- factory_girl (~> 2.5.0)
+ execjs (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.0.11)
- friendly_id (4.0.1)
- fuubar (1.0.0)
- rspec (~> 2.0)
- rspec-instafail (~> 0.2.0)
- ruby-progressbar (~> 0.0.10)
- generator_spec (0.8.5)
- rails (>= 3.0, < 4.0)
- rspec-rails
- globalize3 (0.2.0)
- activemodel (>= 3.0.0)
- activerecord (>= 3.0.0)
- paper_trail (~> 2)
- guard (1.0.1)
- ffi (>= 0.5.0)
- thor (~> 0.14.6)
- guard-rspec (0.6.0)
- guard (>= 0.10.0)
- guard-spork (0.5.2)
- guard (>= 0.10.0)
+ ffi (1.11.1)
+ ffi (1.11.1-x86-mingw32)
+ formatador (0.2.5)
+ friendly_id (4.0.10.1)
+ activerecord (>= 3.0, < 4.0)
+ generator_spec (0.9.4)
+ activesupport (>= 3.0.0)
+ railties (>= 3.0.0)
+ globalize (3.1.0)
+ activemodel (>= 3.1.0, < 4.0.0)
+ activerecord (>= 3.1.0, < 4.0.0)
+ guard (2.15.0)
+ formatador (>= 0.2.4)
+ listen (>= 2.7, < 4.0)
+ lumberjack (>= 1.0.12, < 2.0)
+ nenv (~> 0.1)
+ notiffany (~> 0.0)
+ pry (>= 0.9.12)
+ shellany (~> 0.0)
+ thor (>= 0.18.1)
+ guard-compat (1.2.1)
+ guard-spork (2.1.0)
+ childprocess (>= 0.2.3)
+ guard (~> 2.0)
+ guard-compat (~> 1.0)
spork (>= 0.8.4)
- hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.3)
- jquery-rails (2.0.1)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- json (1.6.5)
- json_pure (1.6.5)
- launchy (2.0.5)
- addressable (~> 2.2.6)
- mail (2.4.3)
- i18n (>= 0.4.0)
+ hike (1.2.3)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
+ journey (1.0.4)
+ jquery-rails (2.3.0)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.8.6)
+ libnotify (0.1.4)
+ ffi (>= 0.6.2)
+ listen (3.1.5)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ ruby_dep (~> 1.2)
+ lumberjack (1.0.13)
+ mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.1.0)
- mysql (2.8.1-x86-mingw32)
- nokogiri (1.5.2-x86-mingw32)
- orm_adapter (0.0.6)
- paper_trail (2.6.0)
- rails (~> 3)
- pg (0.13.2-x86-mingw32)
- polyglot (0.3.3)
- rack (1.4.1)
- rack-cache (1.2)
+ method_source (0.9.2)
+ mime-types (1.25.1)
+ mini_portile2 (2.4.0)
+ multi_json (1.13.1)
+ mysql2 (0.5.2)
+ mysql2 (0.5.2-x86-mingw32)
+ nenv (0.3.0)
+ nokogiri (1.10.3)
+ mini_portile2 (~> 2.4.0)
+ nokogiri (1.10.3-x86-mingw32)
+ mini_portile2 (~> 2.4.0)
+ notiffany (0.1.1)
+ nenv (~> 0.1)
+ shellany (~> 0.0)
+ orm_adapter (0.5.0)
+ pg (1.1.4)
+ pg (1.1.4-x86-mingw32)
+ polyglot (0.3.5)
+ pry (0.12.2)
+ coderay (~> 1.1.0)
+ method_source (~> 0.9.0)
+ rack (1.4.7)
+ rack-cache (1.9.0)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.4)
rack
- rack-test (0.6.1)
+ rack-test (0.6.3)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
- bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ rails-i18n (0.7.4)
+ i18n (~> 0.5)
+ railties (3.2.22.5)
+ actionpack (= 3.2.22.5)
+ activesupport (= 3.2.22.5)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
- rb-fchange (0.0.5)
+ thor (>= 0.14.6, < 2.0)
+ rake (12.3.2)
+ rb-fchange (0.0.6)
ffi
+ rb-fsevent (0.10.3)
+ rb-inotify (0.10.0)
+ ffi (~> 1.0)
rb-notifu (0.0.4)
- rdoc (3.12)
+ rdoc (3.12.2)
json (~> 1.4)
- refinerycms (2.0.1)
- bundler (~> 1.0)
- refinerycms-authentication (= 2.0.1)
- refinerycms-core (= 2.0.1)
- refinerycms-dashboard (= 2.0.1)
- refinerycms-images (= 2.0.1)
- refinerycms-pages (= 2.0.1)
- refinerycms-resources (= 2.0.1)
- refinerycms-authentication (2.0.1)
- devise (~> 2.0.0)
- refinerycms-core (= 2.0.1)
- refinerycms-core (2.0.1)
- acts_as_indexed (~> 0.7.7)
- awesome_nested_set (~> 2.1.0)
- coffee-rails (~> 3.2.1)
- friendly_id (~> 4.0.1)
- globalize3 (~> 0.2.0)
- jquery-rails (~> 2.0.0)
- rails (>= 3.1.3, < 3.3)
+ refinerycms (2.1.5)
+ bundler (>= 1.2.2, < 2.0)
+ refinerycms-authentication (= 2.1.5)
+ refinerycms-core (= 2.1.5)
+ refinerycms-dashboard (= 2.1.5)
+ refinerycms-images (= 2.1.5)
+ refinerycms-pages (= 2.1.5)
+ refinerycms-resources (= 2.1.5)
+ refinerycms-authentication (2.1.5)
+ actionmailer (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+ devise (~> 2.2.3)
+ refinerycms-core (= 2.1.5)
+ refinerycms-core (2.1.5)
+ actionpack (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+ activerecord (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+ awesome_nested_set (~> 2.1.3)
+ decorators (~> 1.0.0)
+ jquery-rails (~> 2.3.0)
+ railties (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+ refinerycms-i18n (~> 2.1.0)
sass-rails (~> 3.2.3)
- truncate_html (~> 0.5)
- uglifier (>= 1.0.3)
+ truncate_html (~> 0.9)
will_paginate (~> 3.0.2)
- refinerycms-dashboard (2.0.1)
- refinerycms-core (= 2.0.1)
- refinerycms-images (2.0.1)
- dragonfly (~> 0.9.8)
- rack-cache (>= 0.5.3)
- refinerycms-core (= 2.0.1)
- refinerycms-pages (2.0.1)
- awesome_nested_set (~> 2.1.0)
+ refinerycms-dashboard (2.1.5)
+ refinerycms-core (= 2.1.5)
+ refinerycms-i18n (2.1.0)
+ rails-i18n (~> 0.7.3)
+ routing-filter (~> 0.3.0)
+ refinerycms-images (2.1.5)
+ dragonfly (~> 0.9.14)
+ refinerycms-core (= 2.1.5)
+ refinerycms-pages (2.1.5)
+ awesome_nested_set (~> 2.1.3)
babosa (!= 0.3.6)
- refinerycms-core (= 2.0.1)
- seo_meta (~> 1.2.0)
- refinerycms-resources (2.0.1)
- dragonfly (~> 0.9.8)
- rack-cache (>= 0.5.3)
- refinerycms-core (= 2.0.1)
- refinerycms-testing (2.0.1)
- capybara (~> 1.1.0)
- database_cleaner (~> 0.7.1)
- factory_girl_rails (~> 1.6.0)
- fuubar
- guard-rspec (~> 0.6.0)
- guard-spork (~> 0.5.2)
- json_pure
- launchy
- rack-test (~> 0.6.0)
- refinerycms-core (= 2.0.1)
- rspec-instafail
- rspec-rails (~> 2.8.1)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-instafail (0.2.2)
- rspec-mocks (2.8.0)
- rspec-rails (2.8.1)
+ friendly_id (~> 4.0.9)
+ globalize (~> 3.1.0)
+ refinerycms-core (= 2.1.5)
+ seo_meta (~> 1.4.0)
+ refinerycms-resources (2.1.5)
+ acts_as_indexed (~> 0.8.0)
+ dragonfly (~> 0.9.12)
+ refinerycms-core (= 2.1.5)
+ refinerycms-testing (2.1.5)
+ capybara (~> 2.1.0)
+ database_cleaner (~> 1.2.0)
+ factory_girl_rails (~> 4.2.1)
+ mime-types (~> 1.16)
+ refinerycms-core (= 2.1.5)
+ rspec-rails (~> 2.13)
+ selenium-webdriver (~> 2.38.0)
+ routing-filter (0.3.1)
+ actionpack
+ rspec-collection_matchers (1.1.3)
+ rspec-expectations (>= 2.99.0.beta1)
+ rspec-core (2.99.2)
+ rspec-expectations (2.99.2)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.99.4)
+ rspec-rails (2.99.0)
actionpack (>= 3.0)
+ activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.8.0)
- ruby-progressbar (0.0.10)
- rubyzip (0.9.6.1)
- sass (3.1.15)
- sass-rails (3.2.4)
+ rspec-collection_matchers
+ rspec-core (~> 2.99.0)
+ rspec-expectations (~> 2.99.0)
+ rspec-mocks (~> 2.99.0)
+ ruby_dep (1.5.0)
+ rubyzip (1.2.2)
+ sass (3.7.4)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.20.0)
+ selenium-webdriver (2.38.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0)
multi_json (~> 1.0)
- rubyzip
- seo_meta (1.2.0)
+ rubyzip (~> 1.0)
+ websocket (~> 1.0.4)
+ seo_meta (1.4.0)
railties (>= 3.0.0)
- spork (0.9.0-x86-mingw32)
- win32-process
- sprockets (2.1.2)
+ shellany (0.0.1)
+ spork (0.9.2)
+ sprockets (2.2.3)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5-x86-mingw32)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.10)
+ sqlite3 (1.4.1)
+ thor (0.20.3)
+ tilt (1.4.1)
+ treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- truncate_html (0.5.4)
- tzinfo (0.3.32)
- uglifier (1.2.3)
- execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- warden (1.1.1)
+ truncate_html (0.9.3)
+ tzinfo (0.3.55)
+ uglifier (4.1.20)
+ execjs (>= 0.3.0, < 3)
+ warden (1.2.7)
rack (>= 1.0)
- will_paginate (3.0.3)
- win32-api (1.4.8-x86-mingw32)
- win32-process (0.6.5)
- windows-pr (>= 1.1.2)
- win32console (1.3.0-x86-mingw32)
- windows-api (0.4.1)
- win32-api (>= 1.4.5)
- windows-pr (1.2.1)
- win32-api (>= 1.4.5)
- windows-api (>= 0.3.0)
- xpath (0.1.4)
+ websocket (1.0.7)
+ will_paginate (3.0.12)
+ win32console (1.3.2-x86-mingw32)
+ xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS
+ ruby
x86-mingw32
DEPENDENCIES
@@ -271,15 +293,20 @@ DEPENDENCIES
guard-spork
jquery-rails
jruby-openssl
- mysql
+ libnotify (~> 0.1.3)
+ mysql2
pg
rb-fchange (~> 0.0.5)
+ rb-inotify (>= 0.5.1)
rb-notifu (~> 0.0.4)
- refinerycms (~> 2.0.0)
+ refinerycms (~> 2.1.0)
refinerycms-pc_banners!
- refinerycms-testing (~> 2.0.0)
+ refinerycms-testing (~> 2.1.0)
sass-rails
- spork (= 0.9.0.rc9)
+ spork (~> 0.9.0)
sqlite3
uglifier
win32console
+
+BUNDLED WITH
+ 1.17.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 01:23:45 +0000