X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/31c711afc4ff8a1728aeb3e5f405a131047671c9..f883adf66c3da731904d5c25c779a13416ce9193:/apps/workbench/Gemfile.lock diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index 8e748326a1..173be13cc3 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -1,41 +1,48 @@ +GIT + remote: https://github.com/holtkampw/themes_for_rails + revision: 1fd2d7897d75ae0d6375f4c390df87b8e91ad417 + ref: 1fd2d7897d75ae0d6375f4c390df87b8e91ad417 + specs: + themes_for_rails (0.5.1) + rails (>= 3.0.0) + GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.15) - actionpack (= 3.2.15) + actionmailer (4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) mail (~> 2.5.4) - actionpack (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) - builder (~> 3.0.0) + actionpack (4.1.1) + actionview (= 4.1.1) + activesupport (= 4.1.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionview (4.1.1) + activesupport (= 4.1.1) + 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) - activemodel (3.2.15) - activesupport (= 3.2.15) - builder (~> 3.0.0) - activerecord (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.15) - activemodel (= 3.2.15) - activesupport (= 3.2.15) - activesupport (3.2.15) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + activemodel (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + activerecord (4.1.1) + activemodel (= 4.1.1) + activesupport (= 4.1.1) + arel (~> 5.0.0) + activesupport (4.1.1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) andand (1.3.3) - arel (3.0.2) + arel (5.0.1.20140414130214) bootstrap-sass (3.1.0.1) sass (~> 3.2) bootstrap-x-editable-rails (1.5.1.1) railties (>= 3.0) - builder (3.0.4) + builder (3.2.2) capistrano (2.15.5) highline net-scp (>= 1.0.0) @@ -51,13 +58,13 @@ GEM childprocess (0.5.1) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) - coffee-rails (3.2.2) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.7.0) commonjs (0.2.7) daemon_controller (1.1.7) deep_merge (1.0.1) @@ -68,8 +75,7 @@ GEM highline (1.6.20) hike (1.2.3) httpclient (2.3.4.1) - i18n (0.6.5) - journey (1.0.4) + i18n (0.6.9) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -83,9 +89,10 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.25) + mime-types (1.25.1) mini_portile (0.5.2) - multi_json (1.8.2) + minitest (5.3.3) + multi_json (1.10.0) net-scp (1.1.2) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -109,41 +116,36 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.3) - rack + polyglot (0.3.4) + rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.15) - actionmailer (= 3.2.15) - actionpack (= 3.2.15) - activerecord (= 3.2.15) - activeresource (= 3.2.15) - activesupport (= 3.2.15) - bundler (~> 1.0) - railties (= 3.2.15) - railties (3.2.15) - actionpack (= 3.2.15) - activesupport (= 3.2.15) - rack-ssl (~> 1.3.2) + rails (4.1.1) + actionmailer (= 4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + activemodel (= 4.1.1) + activerecord (= 4.1.1) + activesupport (= 4.1.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.1) + sprockets-rails (~> 2.0) + railties (4.1.1) + actionpack (= 4.1.1) + activesupport (= 4.1.1) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (10.1.0) - rdoc (3.12.2) - json (~> 1.4) + thor (>= 0.18.1, < 2.0) + rake (10.3.1) ref (1.0.5) rubyzip (1.1.0) rvm-capistrano (1.5.1) capistrano (~> 2.15.4) sass (3.2.12) - sass-rails (3.2.6) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) selenium-webdriver (2.40.0) childprocess (>= 0.5.0) multi_json (~> 1.0) @@ -155,23 +157,27 @@ GEM simplecov-html (0.7.1) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) - sprockets (2.2.2) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.1.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) sqlite3 (1.3.8) - themes_for_rails (0.5.1) - rails (>= 3.0.0) therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref - thor (0.18.1) + thor (0.19.1) + thread_safe (0.3.3) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) + tzinfo (1.1.0) + thread_safe (~> 0.1) uglifier (2.3.1) execjs (>= 0.3.0) json (>= 1.8.0) @@ -189,26 +195,27 @@ DEPENDENCIES bootstrap-sass (~> 3.1.0) bootstrap-x-editable-rails capybara - coffee-rails (~> 3.2.0) + coffee-rails deep_merge headless httpclient jquery-rails less less-rails + minitest (>= 5.0.0) multi_json oj passenger piwik_analytics poltergeist - rails (~> 3.2.0) + rails (~> 4.1.0) rvm-capistrano sass - sass-rails (~> 3.2.0) + sass-rails selenium-webdriver simplecov (~> 0.7.1) simplecov-rcov sqlite3 - themes_for_rails + themes_for_rails! therubyracer uglifier (>= 1.0.3)