diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 408 |
1 files changed, 220 insertions, 188 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6b23554c4..7206994bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,10 @@ GIT remote: https://github.com/afimb/ninoxe.git - revision: 37fdb46bfa9c089a231ea5e7e093a9b78cc11b5e + revision: bfe0ccb3519e6b0e4e99657c1f108d07754ff7c7 + branch: rails4 specs: ninoxe (1.1.3) - activerecord (~> 3.2.13) + activerecord (~> 4.1.1) acts-as-taggable-on (>= 3) acts_as_list (>= 0.1.6) acts_as_tree (>= 1.1.0) @@ -19,55 +20,55 @@ GEM RedCloth (4.2.9) RedCloth (4.2.9-java) SyslogLogger (1.4.1) - actionmailer (3.2.18) - actionpack (= 3.2.18) - mail (~> 2.5.4) - actionpack (3.2.18) - activemodel (= 3.2.18) - activesupport (= 3.2.18) - builder (~> 3.0.0) + actionmailer (4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.8) + actionview (= 4.1.8) + activesupport (= 4.1.8) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionview (4.1.8) + activesupport (= 4.1.8) + builder (~> 3.1) 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) - active_enum (0.9.12) - activesupport (~> 3.0) - activemodel (3.2.18) - activesupport (= 3.2.18) - builder (~> 3.0.0) - activerecord (3.2.18) - activemodel (= 3.2.18) - activesupport (= 3.2.18) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activerecord-jdbc-adapter (1.3.11) + activemodel (4.1.8) + activesupport (= 4.1.8) + builder (~> 3.1) + activerecord (4.1.8) + activemodel (= 4.1.8) + activesupport (= 4.1.8) + arel (~> 5.0.0) + activerecord-jdbc-adapter (1.3.13) activerecord (>= 2.2) - activerecord-jdbcpostgresql-adapter (1.3.11) - activerecord-jdbc-adapter (~> 1.3.11) + activerecord-jdbcpostgresql-adapter (1.3.13) + activerecord-jdbc-adapter (~> 1.3.13) jdbc-postgres (>= 9.1) - activeresource (3.2.18) - activemodel (= 3.2.18) - activesupport (= 3.2.18) - activesupport (3.2.18) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + activesupport (4.1.8) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) acts-as-taggable-on (3.4.2) activerecord (>= 3.2, < 5) - acts_as_list (0.1.6) - acts_as_tree-1.8 (1.1.0) - activerecord (>= 3.0.0) + acts_as_list (0.6.0) + activerecord (>= 3.0) acts_as_tree (2.1.0) activerecord (>= 3.0.0) addressable (2.3.5) - arel (3.0.3) - bcrypt-ruby (3.0.1) - bcrypt-ruby (3.0.1-java) - bourne (1.5.0) - mocha (>= 0.13.2, < 0.15) + apartment (0.25.2) + activerecord (>= 3.1.2, < 4.2) + rack (>= 1.3.6) + arel (5.0.1.20140414130214) + ast (2.0.0) + astrolabe (1.3.0) + parser (>= 2.2.0.pre.3, < 3.0) + bcrypt (3.1.9) + bcrypt (3.1.9-java) breadcrumbs_on_rails (2.3.0) - builder (3.0.4) + builder (3.2.2) calendar_helper (0.2.5) open4 callsite (0.0.11) @@ -79,55 +80,55 @@ GEM net-ssh-gateway (>= 1.1.0) capistrano-ext (1.2.1) capistrano (>= 1.0.0) - capybara (1.1.2) + capybara (2.4.4) 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.5.3) - ffi (~> 1.0, >= 1.0.11) - choice (0.1.6) - cocoon (1.1.2) - coffee-rails (3.2.2) + xpath (~> 2.0) + celluloid (0.16.0) + timers (~> 4.0.0) + choice (0.1.7) + cocoon (1.2.6) + coderay (1.1.0) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) - coffee-script (2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.3.3) + coffee-script-source (1.8.0) daemons (1.1.9) + database_cleaner (1.4.0) dbf (2.0.7) fastercsv (~> 1.5.4) - deep_cloneable (2.0.0) + deep_cloneable (2.0.2) activerecord (>= 3.1.0, < 5.0.0) - delayed_job (3.0.3) - activesupport (~> 3.0) - delayed_job_active_record (0.3.2) - activerecord (> 2.1.0) - delayed_job (~> 3.0.0) - devise (2.1.3) - bcrypt-ruby (~> 3.0) + delayed_job (4.0.6) + activesupport (>= 3.0, < 5.0) + delayed_job_active_record (4.0.3) + activerecord (>= 3.0, < 5.0) + delayed_job (>= 3.0, < 4.1) + devise (3.4.1) + bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) - devise-encryptable (0.1.2) + railties (>= 3.2.6, < 5) + responders + thread_safe (~> 0.1) + warden (~> 1.2.3) + devise-encryptable (0.2.0) devise (>= 2.1.0) devise-i18n (0.10.3) - devise_invitable (1.1.0) - actionmailer (~> 3.0) - devise (>= 2.1.0) - railties (~> 3.0) + devise_invitable (1.4.0) + actionmailer (>= 3.2.6, < 5) + devise (>= 3.2.0) diff-lcs (1.2.5) - dr-apartment (0.14.1) dr-ffi-proj4 (0.0.3) ffi (>= 1.0.0) enumerize (0.8.0) activesupport (>= 3.2) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.2.2) factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) @@ -142,6 +143,7 @@ GEM sass (~> 3.2) foreigner (1.6.0) activerecord (>= 3.0.0) + formatador (0.2.5) formtastic (2.3.1) actionpack (>= 3.0) geokit (1.6.7) @@ -156,22 +158,33 @@ GEM georuby (>= 1.9.8) rgeo (>= 0.3.20) google-analytics-rails (0.0.4) - guard (1.3.2) - listen (>= 0.4.2) - thor (>= 0.14.6) - guard-rspec (1.2.1) - guard (>= 1.1) + guard (2.10.5) + formatador (>= 0.2.4) + listen (~> 2.7) + lumberjack (~> 1.0) + nenv (~> 0.1) + pry (>= 0.9.12) + thor (>= 0.18.1) + guard-compat (1.2.0) + guard-rspec (4.5.0) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) has_scope (0.6.0.rc) actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) highline (1.6.15) hike (1.2.3) - i18n (0.6.11) + hitimes (1.2.2) + hitimes (1.2.2-java) + i18n (0.7.0) inherited_resources (1.4.1) has_scope (~> 0.6.0.rc) responders (~> 1.0.0.rc) + jbuilder (2.2.6) + activesupport (>= 3.0.0, < 5) + multi_json (~> 1.2) jdbc-postgres (9.3.1102) - journey (1.0.4) jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -189,31 +202,32 @@ GEM jruby-rack (>= 1.1.10) json (1.8.1) json (1.8.1-java) - language_engine (0.0.5) - rails (~> 3.2.18) + language_engine (0.0.6) + rails (~> 4.1.1) launchy (2.3.0) addressable (~> 2.3) libv8 (3.3.10.4) - listen (0.4.7) - rb-fchange (~> 0.0.5) - rb-fsevent (~> 0.9.1) - rb-inotify (~> 0.8.8) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + listen (2.8.4) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.9) + mail (2.6.3) + mime-types (>= 1.16, < 3) map_layers (0.0.4) meta_request (0.3.4) callsite (~> 0.0, >= 0.0.11) rack-contrib (~> 1.1) railties (>= 3.0.0, < 5.0.0) - metaclass (0.0.1) - mime-types (1.25.1) - mocha (0.14.0) - metaclass (~> 0.0.1) + method_source (0.8.2) + mime-types (2.4.3) + mini_portile (0.6.2) + minitest (5.5.0) modernizr-rails (2.0.6) morrisjs-rails (0.4.3) railties (> 3.1, < 5) multi_json (1.10.1) + nenv (0.1.1) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -222,33 +236,43 @@ GEM net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) netrc (0.7.9) - nokogiri (1.5.10) - nokogiri (1.5.10-java) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + nokogiri (1.6.5-java) open4 (1.3.0) - orm_adapter (0.4.0) - pg (0.11.0) + orm_adapter (0.5.0) + parser (2.2.0.pre.7) + ast (>= 1.1, < 3.0) + slop (~> 3.4, >= 3.4.5) + pg (0.17.1) polyamorous (1.1.0) activerecord (>= 3.0) - polyglot (0.3.5) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry (0.10.1-java) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + spoon (~> 0.0) rabl (0.11.4) activesupport (>= 2.3.14) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) + rack (1.5.2) rack-contrib (1.2.0) rack (>= 0.9.1) - rack-ssl (1.3.4) - rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.18) - actionmailer (= 3.2.18) - actionpack (= 3.2.18) - activerecord (= 3.2.18) - activeresource (= 3.2.18) - activesupport (= 3.2.18) - bundler (~> 1.0) - railties (= 3.2.18) + rails (4.1.8) + actionmailer (= 4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) + activemodel (= 4.1.8) + activerecord (= 4.1.8) + activesupport (= 4.1.8) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.8) + sprockets-rails (~> 2.0) rails-assets-bootstrap (3.1.1) rails-assets-jquery (>= 1.9.0) rails-assets-bootstrap-sass-official (3.3.0) @@ -274,14 +298,13 @@ GEM activesupport (>= 3.0) choice (~> 0.1.6) ruby-graphviz (~> 1.0.4) - railties (3.2.18) - actionpack (= 3.2.18) - activesupport (= 3.2.18) - rack-ssl (~> 1.3.2) + railties (4.1.8) + actionpack (= 4.1.8) + activesupport (= 4.1.8) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.3.2) + thor (>= 0.18.1, < 2.0) + rainbow (2.0.0) + rake (10.4.2) ransack (1.4.1) actionpack (>= 3.0) activerecord (>= 3.0) @@ -289,22 +312,11 @@ GEM i18n polyamorous (~> 1.1) raphael-rails (2.1.2) - rb-fchange (0.0.5) - ffi - rb-fsevent (0.9.1) - rb-inotify (0.8.8) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) ffi (>= 0.5.0) - rdoc (3.12.2) + rdoc (4.2.0) json (~> 1.4) - remarkable (4.0.0.alpha4) - rspec (>= 2.0.0.alpha11) - remarkable_activemodel (4.0.0.alpha4) - remarkable (~> 4.0.0.alpha4) - rspec (>= 2.0.0.alpha11) - remarkable_activerecord (4.0.0.alpha4) - remarkable (~> 4.0.0.alpha4) - remarkable_activemodel (~> 4.0.0.alpha4) - rspec (>= 2.0.0.alpha11) responders (1.0.0) railties (>= 3.2, < 5) rest_client (1.8.2) @@ -314,47 +326,56 @@ GEM nokogiri rubyzip spreadsheet (> 0.6.4) - rspec (2.13.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) - rspec-core (2.13.0) - rspec-expectations (2.13.0) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.13.0) - rspec-rails (2.13.0) + rspec (3.1.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-rails (3.1.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) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.2) ruby-graphviz (1.0.9) ruby-ole (1.2.11.7) rubyzip (1.1.6) - sass (3.4.5) - sass-rails (3.2.6) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) - selenium-webdriver (2.43.0) - childprocess (~> 0.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0) - shoulda-matchers (1.5.6) - activesupport (>= 3.0.0) - bourne (~> 1.3) - simple_form (2.1.1) - actionpack (~> 3.0) - activemodel (~> 3.0) + sass (3.2.19) + sass-rails (4.0.5) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) + sprockets-rails (~> 2.0) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + simple_form (3.1.0) + actionpack (~> 4.0) + activemodel (~> 4.0) + slop (3.6.0) + spoon (0.0.4) + ffi spreadsheet (0.9.7) ruby-ole (>= 1.0) - sprockets (2.2.3) + spring (1.2.0) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.2.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) sqlite3 (1.3.6) squeel (1.2.1) activerecord (>= 3.0) @@ -366,26 +387,36 @@ GEM therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.4) thor (0.19.1) + thread_safe (0.3.4) + thread_safe (0.3.4-java) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.42) - uglifier (1.2.7) + timers (4.0.1) + hitimes + transpec (2.3.7) + activesupport (>= 3.0, < 5.0) + astrolabe (~> 1.2) + bundler (~> 1.3) + json (~> 1.8) + parser (>= 2.2.0.pre.3, < 3.0) + rainbow (>= 1.99.1, < 3.0) + turbolinks (2.5.3) + coffee-rails + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.6.1) execjs (>= 0.3.0) - multi_json (~> 1.3) + json (>= 1.8.0) warbler (1.4.4) jruby-jars (>= 1.5.6, < 2.0) jruby-rack (>= 1.0.0) rake (>= 0.9.6) rubyzip (>= 0.9, < 1.2) - warden (1.2.1) + warden (1.2.3) rack (>= 1.0) - websocket (1.2.1) will_paginate (3.0.5) will_paginate-bootstrap (1.0.0) will_paginate (>= 3.0.3) - xpath (0.1.4) + xpath (2.0.0) nokogiri (~> 1.3) PLATFORMS @@ -395,25 +426,24 @@ PLATFORMS DEPENDENCIES RedCloth SyslogLogger - active_enum activerecord-jdbcpostgresql-adapter (~> 1.3.3) - acts_as_list (= 0.1.6) - acts_as_tree-1.8 (= 1.1.0) + acts_as_list (~> 0.6.0) + acts_as_tree (~> 2.1.0) + apartment breadcrumbs_on_rails calendar_helper (= 0.2.5) capistrano capistrano-ext - capybara - cocoon (= 1.1.2) - coffee-rails (~> 3.2.1) - coffee-script-source + capybara (~> 2.4.0) + cocoon + coffee-rails (~> 4.0.0) daemons + database_cleaner delayed_job_active_record - devise (= 2.1.3) + devise (~> 3.4.0) devise-encryptable devise-i18n devise_invitable - dr-apartment factory_girl_rails (= 1.7) font-awesome-sass (~> 4.2.0) formtastic (= 2.3.1) @@ -423,21 +453,22 @@ DEPENDENCIES guard guard-rspec inherited_resources - jquery-rails (= 2.2.1) + jbuilder (~> 2.0) + jquery-rails jquery-ui-sass-rails jruby-openssl jruby-rack-worker json - language_engine (= 0.0.5) + language_engine (= 0.0.6) launchy map_layers (= 0.0.4) meta_request modernizr-rails (~> 2.0.6) morrisjs-rails ninoxe! - pg (~> 0.11.0) + pg rabl - rails (= 3.2.18) + rails (= 4.1.8) rails-assets-bootstrap-sass-official (~> 3.3.0) rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3) rails-assets-jquery-tokeninput (~> 1.7.0) @@ -450,20 +481,21 @@ DEPENDENCIES raphael-rails rb-fsevent rb-inotify - remarkable (~> 4.0.0.alpha4) - remarkable_activerecord (~> 4.0.0.alpha4) rest_client roo - rspec-rails (~> 2.0) + rspec-rails (~> 3.1.0) rubyzip (~> 1.1.6) - sass-rails (~> 3.2.3) - shoulda-matchers - simple_form (= 2.1.1) + sass-rails (~> 4.0.3) + sdoc (~> 0.4.0) + simple_form + spring sqlite3 squeel therubyracer (~> 0.10.2) therubyrhino - uglifier (>= 1.0.3) + transpec + turbolinks + uglifier (>= 1.3.0) warbler will_paginate (~> 3.0) will_paginate-bootstrap |