diff --git a/Gemfile b/Gemfile index 8064943aa..8bf43cfdf 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem 'netaddr', '1.5.0' gem 'nokogiri', '1.5.5' gem 'oauth', '0.4.5' gem 'rack', '1.1.3' -gem 'rake', '< 0.10' +gem 'rake', '< 12.4' gem 'rdoc', '3.12' gem 'ratom-instructure', '0.6.9', :require => "atom" # custom gem until necessary changes are merged into mainstream if !ONE_NINE diff --git a/Gemfile.lock b/Gemfile.lock index 8d9680cf6..d955fa032 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,10 +12,9 @@ GEM activesupport (= 2.3.17) activesupport (2.3.17) addressable (2.3.3) - adobe_connect (0.0.7) + adobe_connect (1.0.8) activesupport (>= 2.3.17) - nokogiri (~> 1.5.5) - pry (>= 0.9.11.4) + nokogiri (>= 1.5.5, < 1.11) rake (>= 0.9.2) authlogic (2.1.3) activesupport @@ -38,7 +37,7 @@ GEM ffi (~> 1.0, >= 1.0.11) chunky_png (1.2.7) closure-compiler (1.1.8) - coderay (1.0.9) + coderay (1.1.3) coffee-script (2.2.0) coffee-script-source execjs @@ -79,21 +78,17 @@ GEM pry (>= 0.9.10) thor (>= 0.14.6) hairtrigger (0.1.14) - activerecord (>= 2.3.0) activerecord (>= 2.3.0) ruby2ruby (= 1.2.5) ruby_parser (= 2.0.6) - happymapper (0.4.0) - libxml-ruby (~> 2.0) hashery (1.3.0) highline (1.6.1) - hoe (3.5.1) - rake (>= 0.8, < 11.0) + hoe (3.22.2) + rake (>= 0.8, < 15.0) i18n (0.6.0) icalendar (1.1.5) instructure-redis-store (1.0.0.2.instructure1) redis (= 3.0.1) - redis (= 3.0.1) jammit (0.6.0) closure-compiler (>= 0.1.0) yui-compressor (>= 0.9.1) @@ -118,19 +113,12 @@ GEM mail (>= 2.0.3) maildir (>= 0.5.0) metaclass (0.0.1) - method_source (0.8.1) + method_source (1.0.0) mime-types (1.17.2) mini_magick (1.3.2) subexec (~> 0.0.4) mocha (0.12.3) metaclass (~> 0.0.1) - moodle2cc (0.1.6) - builder - happymapper - nokogiri - rdiscount - rubyzip - thor multi_json (1.6.1) net-ldap (0.3.1) netaddr (1.5.0) @@ -141,10 +129,9 @@ GEM parallel pg (0.10.1) polyglot (0.3.3) - pry (0.9.12) - coderay (~> 1.0.5) - method_source (~> 0.8) - slop (~> 3.4) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) querystring (0.1.0) rack (1.1.3) rack-test (0.6.2) @@ -157,7 +144,7 @@ GEM activesupport (= 2.3.17) rake (>= 0.8.3) raindrops (0.10.0) - rake (0.9.6) + rake (12.3.3) ratom-instructure (0.6.9) libxml-ruby (>= 1.1.2) rb-fchange (0.0.6) @@ -169,7 +156,6 @@ GEM rdiscount (1.6.8) rdoc (3.12) json (~> 1.4) - recaptcha (0.3.1) redis (3.0.1) require_relative (1.0.1) ritex (1.0.1) @@ -192,7 +178,6 @@ GEM rubycas-client (2.2.1) activesupport rubyzip (0.9.5) - rufus-scheduler (2.0.6) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) sass (3.2.1) @@ -203,10 +188,6 @@ GEM rubyzip sexp_processor (3.0.5) simple_uuid (0.3.0) - slop (3.4.3) - soap4r-middleware (0.8.3) - soap4r-ruby1.9 (= 2.0.0) - soap4r-ruby1.9 (2.0.0) statsd-ruby (1.0.0) subexec (0.0.4) test-unit (1.2.3) @@ -278,7 +259,6 @@ DEPENDENCIES mime-types (= 1.17.2) mini_magick (= 1.3.2) mocha (= 0.12.3) - moodle2cc (= 0.1.6) net-ldap (= 0.3.1) netaddr (= 1.5.0) nokogiri (= 1.5.5) @@ -288,7 +268,7 @@ DEPENDENCIES pg (= 0.10.1) rack (= 1.1.3) rails (= 2.3.17) - rake (< 0.10) + rake (< 12.4) ratom-instructure (= 0.6.9) rb-fchange rb-fsevent @@ -296,7 +276,6 @@ DEPENDENCIES rcov (= 0.9.9) rdiscount (= 1.6.8) rdoc (= 3.12) - recaptcha (= 0.3.1) redis (= 3.0.1) require_relative (= 1.0.1) ritex (= 1.0.1) @@ -309,12 +288,10 @@ DEPENDENCIES ruby_parser (= 2.0.6) rubycas-client (= 2.2.1) rubyzip (= 0.9.5) - rufus-scheduler (= 2.0.6) sanitize (= 2.0.3) sass (= 3.2.1) selenium-webdriver (= 2.27.2) sexp_processor (= 3.0.5) - soap4r-middleware (= 0.8.3) statsd-ruby (= 1.0.0) test-unit (= 1.2.3) timecop (= 0.5.9.1)