X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/29b0dccdf90d3cf1e7472f0653cc9a38cbbadc26..fbd54468b13466839c24d880a3d041d0a49371af:/apps/workbench/Gemfile.lock diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index 8c188476c8..b4e2400bed 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -1,7 +1,6 @@ GIT - remote: https://github.com/holtkampw/themes_for_rails - revision: 1fd2d7897d75ae0d6375f4c390df87b8e91ad417 - ref: 1fd2d7897d75ae0d6375f4c390df87b8e91ad417 + remote: https://github.com/curoverse/themes_for_rails + revision: 61154877047d2346890bda0b7be5827cf51a6a76 specs: themes_for_rails (0.5.1) rails (>= 3.0.0) @@ -10,27 +9,29 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - mail (~> 2.5.4) - actionpack (4.1.1) - actionview (= 4.1.1) - activesupport (= 4.1.1) + actionmailer (4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.12) + actionview (= 4.1.12) + activesupport (= 4.1.12) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.1) - activesupport (= 4.1.1) + actionview (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.1) - activesupport (= 4.1.1) + activemodel (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) - activerecord (4.1.1) - activemodel (= 4.1.1) - activesupport (= 4.1.1) + activerecord (4.1.12) + activemodel (= 4.1.12) + activesupport (= 4.1.12) arel (~> 5.0.0) - activesupport (4.1.1) + activerecord-nulldb-adapter (0.3.1) + activerecord (>= 2.0.0) + activesupport (4.1.12) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -38,9 +39,9 @@ GEM tzinfo (~> 1.1) addressable (2.3.6) andand (1.3.3) - angularjs-rails (1.3.3) + angularjs-rails (1.3.8) arel (5.0.1.20140414130214) - arvados (0.1.20141114230720) + arvados (0.1.20150511150219) activesupport (>= 3.2.13) andand (~> 1.3, >= 1.3.3) google-api-client (~> 0.6.3, >= 0.6.3) @@ -50,7 +51,7 @@ GEM addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - bootstrap-sass (3.1.0.1) + bootstrap-sass (3.1.1.1) sass (~> 3.2) bootstrap-tab-history-rails (0.1.0) railties (>= 3.1) @@ -67,33 +68,39 @@ GEM net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) - capybara (2.4.4) + capybara (2.5.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.1) + childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) - columnize (0.8.9) + coffee-script-source (1.8.0) + columnize (0.9.0) commonjs (0.2.7) - daemon_controller (1.1.7) + daemon_controller (1.2.0) debugger-linecache (1.2.0) deep_merge (1.0.1) + docile (1.1.5) erubis (2.7.0) - execjs (2.0.2) + execjs (2.2.2) extlib (0.9.16) faraday (0.8.9) multipart-post (~> 1.2.0) - ffi (1.9.3) + fast_stack (0.1.0) + rake + rake-compiler + ffi (1.9.10) + flamegraph (0.1.0) + fast_stack google-api-client (0.6.4) addressable (>= 2.3.2) autoparse (>= 0.3.3) @@ -104,135 +111,138 @@ GEM multi_json (>= 1.0.0) signet (~> 0.4.5) uuidtools (>= 2.1.0) - headless (1.0.1) - highline (1.6.20) - hike (1.2.3) - httpclient (2.5.0) - i18n (0.6.9) - jquery-rails (3.0.4) + headless (1.0.2) + highline (1.6.21) + httpclient (2.6.0.1) + i18n (0.7.0) + jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.3) jwt (0.1.13) multi_json (>= 1.5) launchy (2.4.3) addressable (~> 2.3) - less (2.4.0) + less (2.6.0) commonjs (~> 0.2.7) - less-rails (2.4.2) + less-rails (2.6.0) actionpack (>= 3.1) - less (~> 2.4.0) - libv8 (3.16.14.3) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + less (~> 2.6.0) + libv8 (3.16.14.7) + mail (2.6.3) + mime-types (>= 1.16, < 3) metaclass (0.0.4) - mime-types (1.25.1) - mini_portile (0.6.0) - minitest (5.3.3) + mime-types (2.99) + mini_portile (0.6.2) + minitest (5.7.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.10.0) + morrisjs-rails (0.5.1) + railties (> 3.1, < 5) + multi_json (1.11.2) multipart-post (1.2.0) - net-scp (1.1.2) + net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.7.0) + net-ssh (2.9.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) - oj (2.1.7) - passenger (4.0.23) - daemon_controller (>= 1.1.0) + nokogiri (1.6.6.4) + mini_portile (~> 0.6.0) + oj (2.11.2) + passenger (4.0.57) + daemon_controller (>= 1.2.0) rack rake (>= 0.8.1) piwik_analytics (1.0.2) actionpack activesupport rails (>= 3.0.0) - poltergeist (1.5.0) + poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.4) - rack (1.5.2) - rack-test (0.6.2) + rack (1.5.5) + rack-mini-profiler (0.9.2) + rack (>= 1.1.3) + rack-test (0.6.3) rack (>= 1.0) - 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) + rails (4.1.12) + actionmailer (= 4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) + activemodel (= 4.1.12) + activerecord (= 4.1.12) + activesupport (= 4.1.12) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.1) + railties (= 4.1.12) sprockets-rails (~> 2.0) - railties (4.1.1) - actionpack (= 4.1.1) - activesupport (= 4.1.1) + rails-perftest (0.0.5) + railties (4.1.12) + actionpack (= 4.1.12) + activesupport (= 4.1.12) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.1) + rake (10.4.2) + rake-compiler (0.9.5) + rake + raphael-rails (2.1.2) ref (1.0.5) ruby-debug-passenger (0.2.0) - rubyzip (1.1.0) - rvm-capistrano (1.5.1) + ruby-prof (0.15.2) + rubyzip (1.1.7) + rvm-capistrano (1.5.5) capistrano (~> 2.15.4) - sass (3.2.12) - sass-rails (4.0.3) + sass (3.4.9) + sass-rails (5.0.1) 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) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (~> 1.1) + selenium-webdriver (2.48.1) + childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) - websocket (~> 1.0.4) + websocket (~> 1.0) signet (0.4.5) addressable (>= 2.2.3) faraday (~> 0.8.1) jwt (>= 0.1.5) multi_json (>= 1.0.0) - simplecov (0.7.1) + simplecov (0.9.1) + docile (~> 1.1.0) multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slop (3.6.0) - sprockets (2.11.0) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.2.0) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.8) + sprockets (>= 2.8, < 4.0) sshkey (1.6.1) - therubyracer (0.12.0) + therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.3) + thread_safe (0.3.5) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (1.1.0) + tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.3.1) + uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0) uuidtools (2.1.5) - websocket (1.0.7) - websocket-driver (0.3.2) + websocket (1.2.2) + websocket-driver (0.5.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.1) wiselinks (1.2.1) xpath (2.0.0) nokogiri (~> 1.3) @@ -242,9 +252,10 @@ PLATFORMS DEPENDENCIES RedCloth + activerecord-nulldb-adapter andand angularjs-rails - arvados (>= 0.1.20141114230720) + arvados (>= 0.1.20150511150219) bootstrap-sass (~> 3.1.0) bootstrap-tab-history-rails bootstrap-x-editable-rails @@ -252,27 +263,32 @@ DEPENDENCIES capybara coffee-rails deep_merge + flamegraph headless - httpclient (~> 2.5.0) + httpclient (~> 2.5) jquery-rails less less-rails minitest (>= 5.0.0) mocha + morrisjs-rails multi_json oj passenger piwik_analytics poltergeist + rack-mini-profiler rails (~> 4.1.0) + rails-perftest + raphael-rails ruby-debug-passenger + ruby-prof rvm-capistrano sass sass-rails selenium-webdriver - simplecov (~> 0.7.1) + simplecov (~> 0.7) simplecov-rcov - sqlite3 sshkey themes_for_rails! therubyracer