diff options
| -rw-r--r-- | Gemfile.lock | 271 |
1 files changed, 151 insertions, 120 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6b23554c4..2e097c47b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/afimb/ninoxe.git - revision: 37fdb46bfa9c089a231ea5e7e093a9b78cc11b5e + revision: 95471a42daa8a0183f94b1f3beac9242033ed236 specs: ninoxe (1.1.3) activerecord (~> 3.2.13) @@ -18,7 +18,7 @@ GEM specs: RedCloth (4.2.9) RedCloth (4.2.9-java) - SyslogLogger (1.4.1) + SyslogLogger (2.0) actionmailer (3.2.18) actionpack (= 3.2.18) mail (~> 2.5.4) @@ -42,10 +42,10 @@ GEM activesupport (= 3.2.18) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activerecord-jdbc-adapter (1.3.11) + 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) @@ -53,71 +53,74 @@ GEM activesupport (3.2.18) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - acts-as-taggable-on (3.4.2) + acts-as-taggable-on (3.4.3) activerecord (>= 3.2, < 5) acts_as_list (0.1.6) acts_as_tree-1.8 (1.1.0) activerecord (>= 3.0.0) acts_as_tree (2.1.0) activerecord (>= 3.0.0) - addressable (2.3.5) + addressable (2.3.6) 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) + bcrypt (3.1.9) + bcrypt (3.1.9-java) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) + bcrypt-ruby (3.1.5-java) + bcrypt (>= 3.1.3) breadcrumbs_on_rails (2.3.0) builder (3.0.4) calendar_helper (0.2.5) open4 callsite (0.0.11) - capistrano (2.13.5) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) + capistrano (3.3.5) + capistrano-stats (~> 1.1.0) + i18n + rake (>= 10.0.0) + sshkit (~> 1.3) capistrano-ext (1.2.1) capistrano (>= 1.0.0) - capybara (1.1.2) + capistrano-stats (1.1.1) + 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) + xpath (~> 2.0) + celluloid (0.16.0) + timers (~> 4.0.0) + choice (0.1.7) cocoon (1.1.2) + coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.3.3) + coffee-script-source (1.8.0) + colorize (0.7.5) daemons (1.1.9) 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) + 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 (2.1.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - devise-encryptable (0.1.2) + devise-encryptable (0.2.0) devise (>= 2.1.0) - devise-i18n (0.10.3) - devise_invitable (1.1.0) + devise-i18n (0.11.3) + devise_invitable (1.1.8) actionmailer (~> 3.0) - devise (>= 2.1.0) + devise (>= 2.1.2) railties (~> 3.0) diff-lcs (1.2.5) dr-apartment (0.14.1) @@ -126,8 +129,7 @@ GEM 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) @@ -138,10 +140,11 @@ GEM ffi (1.9.6-java) ffi-geos (1.0.0) ffi (>= 1.0.0) - font-awesome-sass (4.2.0) + font-awesome-sass (4.2.2) 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) @@ -155,21 +158,33 @@ GEM geokit (= 1.6.7) 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) + google-analytics-rails (0.0.6) + guard (2.11.1) + formatador (>= 0.2.4) + listen (~> 2.7) + lumberjack (~> 1.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + 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) - inherited_resources (1.4.1) + hitimes (1.2.2) + hitimes (1.2.2-java) + i18n (0.7.0) + inherited_resources (1.5.1) + actionpack (>= 3.2, < 4.2) has_scope (~> 0.6.0.rc) - responders (~> 1.0.0.rc) + railties (>= 3.2, < 4.2) + responders (~> 1.0) jdbc-postgres (9.3.1102) journey (1.0.4) jquery-rails (2.2.1) @@ -182,22 +197,26 @@ GEM jquery-rails jquery-ui-rails (= 4.0.3) railties (>= 3.1.0) - jruby-jars (1.7.16.1) - jruby-openssl (0.9.5-java) - jruby-rack (1.1.16) + jruby-jars (1.7.18) + jruby-openssl (0.9.6-java) + jruby-rack (1.1.17) jruby-rack-worker (0.10.0) jruby-rack (>= 1.1.10) json (1.8.1) json (1.8.1-java) language_engine (0.0.5) rails (~> 3.2.18) - launchy (2.3.0) + launchy (2.4.3) + addressable (~> 2.3) + launchy (2.4.3-java) addressable (~> 2.3) + spoon (~> 0.0.1) libv8 (3.3.10.4) - listen (0.4.7) - rb-fchange (~> 0.0.5) - rb-fsevent (~> 0.9.1) - rb-inotify (~> 0.8.8) + listen (2.8.5) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.9) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -206,31 +225,40 @@ GEM callsite (~> 0.0, >= 0.0.11) rack-contrib (~> 1.1) railties (>= 3.0.0, < 5.0.0) - metaclass (0.0.1) + method_source (0.8.2) mime-types (1.25.1) - mocha (0.14.0) - metaclass (~> 0.0.1) + mini_portile (0.6.2) modernizr-rails (2.0.6) - morrisjs-rails (0.4.3) + morrisjs-rails (0.5.1) railties (> 3.1, < 5) multi_json (1.10.1) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.6.2) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) + nenv (0.1.1) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) netrc (0.7.9) - nokogiri (1.5.10) - nokogiri (1.5.10-java) - open4 (1.3.0) - orm_adapter (0.4.0) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + nokogiri (1.6.5-java) + notiffany (0.0.2) + nenv (~> 0.1) + shellany (~> 0.0) + open4 (1.3.4) + orm_adapter (0.5.0) pg (0.11.0) polyamorous (1.1.0) activerecord (>= 3.0) polyglot (0.3.5) - rabl (0.11.4) + 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.5) activesupport (>= 2.3.14) rack (1.4.5) rack-cache (1.2) @@ -249,29 +277,27 @@ GEM activesupport (= 3.2.18) bundler (~> 1.0) railties (= 3.2.18) - rails-assets-bootstrap (3.1.1) + rails-assets-bootstrap (3.3.1) rails-assets-jquery (>= 1.9.0) - rails-assets-bootstrap-sass-official (3.3.0) + rails-assets-bootstrap-sass-official (3.3.1) rails-assets-jquery (>= 1.9.0) rails-assets-eonasdan-bootstrap-datetimepicker (3.1.3) rails-assets-bootstrap (>= 3.0) rails-assets-jquery (>= 1.8.3) rails-assets-moment (>= 2.8.0) - rails-assets-jquery (2.1.1) + rails-assets-jquery (2.1.3) rails-assets-jquery-tokeninput (1.7.0) rails-assets-jquery (>= 1.5) - rails-assets-moment (2.8.3) + rails-assets-moment (2.8.4) rails-assets-respond (1.4.2) rails-assets-tagmanager (3.0.1) rails-assets-jquery (>= 1.0.0) rails-assets-typeahead.js (0.10.5) rails-assets-jquery (>= 1.7) - rails-assets-typeahead.js-bootstrap3.less (0.2.3) - rails-assets-bootstrap (~> 3.1.0) - rails-assets-typeahead.js (~> 0.10.0) - rails-erd (1.1.0) - activerecord (>= 3.0) - activesupport (>= 3.0) + rails-assets-typeahead.js-bootstrap3.less (0.1.4) + rails-erd (1.2.2) + activerecord (~> 3.2) + activesupport (~> 3.2) choice (~> 0.1.6) ruby-graphviz (~> 1.0.4) railties (3.2.18) @@ -281,18 +307,16 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.3.2) - ransack (1.4.1) + rake (10.4.2) + ransack (1.5.1) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) 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) json (~> 1.4) @@ -305,8 +329,8 @@ GEM remarkable (~> 4.0.0.alpha4) remarkable_activemodel (~> 4.0.0.alpha4) rspec (>= 2.0.0.alpha11) - responders (1.0.0) - railties (>= 3.2, < 5) + responders (1.1.2) + railties (>= 3.2, < 4.2) rest_client (1.8.2) netrc (~> 0.7.7) rgeo (0.3.20) @@ -314,52 +338,58 @@ 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) + rspec (2.99.0) + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) + rspec-collection_matchers (1.1.2) + 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.13.0) - rspec-rails (2.13.0) + rspec-mocks (2.99.2) + rspec-rails (2.99.0) actionpack (>= 3.0) + activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) + rspec-collection_matchers + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) ruby-graphviz (1.0.9) - ruby-ole (1.2.11.7) + ruby-ole (1.2.11.8) rubyzip (1.1.6) - sass (3.4.5) + sass (3.4.9) 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) + shellany (0.0.1) + shoulda-matchers (2.7.0) activesupport (>= 3.0.0) - bourne (~> 1.3) simple_form (2.1.1) actionpack (~> 3.0) activemodel (~> 3.0) - spreadsheet (0.9.7) + slop (3.6.0) + spoon (0.0.4) + ffi + spreadsheet (1.0.0) ruby-ole (>= 1.0) sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) - squeel (1.2.1) + sqlite3 (1.3.10) + squeel (1.2.2) activerecord (>= 3.0) activesupport (>= 3.0) polyamorous (~> 1.1.0) + sshkit (1.6.1) + colorize (>= 0.7.0) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) therubyracer (0.10.2) libv8 (~> 3.3.10) therubyrhino (2.0.4) @@ -367,25 +397,26 @@ GEM therubyrhino_jar (1.7.4) thor (0.19.1) tilt (1.4.1) + timers (4.0.1) + hitimes treetop (1.4.15) polyglot polyglot (>= 0.3.1) tzinfo (0.3.42) - uglifier (1.2.7) + 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.7) + will_paginate-bootstrap (1.0.1) will_paginate (>= 3.0.3) - xpath (0.1.4) + xpath (2.0.0) nokogiri (~> 1.3) PLATFORMS |