X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9bd0009d81d3bcdb1b1b1b3ff070537b6ff68f54..43eb8f415a1a28bfb721892d51b5ba002ac113ea:/apps/workbench/Gemfile.lock diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index fdcd375ed2..34db9cd71c 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -92,7 +92,7 @@ GEM deep_merge (1.0.1) docile (1.1.5) erubis (2.7.0) - execjs (2.2.2) + execjs (2.7.0) extlib (0.9.16) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -123,7 +123,7 @@ GEM signet (~> 0.7) headless (1.0.2) highline (1.6.21) - httpclient (2.6.0.1) + httpclient (2.8.2.4) i18n (0.7.0) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) @@ -142,6 +142,11 @@ GEM logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) + lograge (0.3.6) + actionpack (>= 3) + activesupport (>= 3) + railties (>= 3) + logstash-event (1.2.02) mail (2.6.3) mime-types (>= 1.16, < 3) memoist (0.14.0) @@ -153,7 +158,7 @@ GEM metaclass (~> 0.0.1) morrisjs-rails (0.5.1) railties (> 3.1, < 5) - multi_json (1.12.0) + multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -164,6 +169,8 @@ GEM net-ssh (>= 2.6.5) nokogiri (1.6.6.4) mini_portile (~> 0.6.0) + npm-rails (0.2.1) + rails (>= 3.2) oj (2.11.2) os (0.9.6) passenger (4.0.57) @@ -211,6 +218,7 @@ GEM rubyzip (1.1.7) rvm-capistrano (1.5.5) capistrano (~> 2.15.4) + safe_yaml (1.0.4) sass (3.4.9) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) @@ -218,7 +226,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (~> 1.1) - selenium-webdriver (2.48.1) + selenium-webdriver (2.53.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -251,7 +259,7 @@ GEM tilt (1.4.1) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.0) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) websocket (1.2.2) @@ -284,21 +292,25 @@ DEPENDENCIES jquery-rails less less-rails - minitest (>= 5.0.0) + lograge + logstash-event + minitest (~> 5.0) mocha morrisjs-rails multi_json + npm-rails oj passenger piwik_analytics poltergeist rack-mini-profiler - rails (~> 4.1.0) + rails (~> 4.1) rails-perftest raphael-rails ruby-debug-passenger ruby-prof rvm-capistrano + safe_yaml sass sass-rails selenium-webdriver @@ -307,8 +319,8 @@ DEPENDENCIES sshkey themes_for_rails! therubyracer - uglifier (>= 1.0.3) + uglifier (~> 2.0) wiselinks BUNDLED WITH - 1.12.1 + 1.15.1