X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/46efb1e7f49d08095a6a49a4c6aff045c5eb6f16..2c3c9f64426e825295aeb1f4265d67429ee14cf6:/apps/workbench/Gemfile.lock diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index 9a886972a1..20b8d6164c 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.9) - actionpack (= 4.1.9) - actionview (= 4.1.9) + actionmailer (4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.9) - actionview (= 4.1.9) - activesupport (= 4.1.9) + actionpack (4.1.12) + actionview (= 4.1.12) + activesupport (= 4.1.12) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.9) - activesupport (= 4.1.9) + actionview (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.9) - activesupport (= 4.1.9) + activemodel (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) - activerecord (4.1.9) - activemodel (= 4.1.9) - activesupport (= 4.1.9) + activerecord (4.1.12) + activemodel (= 4.1.12) + activesupport (= 4.1.12) arel (~> 5.0.0) - activesupport (4.1.9) + 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) @@ -40,7 +41,7 @@ GEM andand (1.3.3) angularjs-rails (1.3.8) arel (5.0.1.20140414130214) - arvados (0.1.20150210011250) + arvados (0.1.20150511150219) activesupport (>= 3.2.13) andand (~> 1.3, >= 1.3.3) google-api-client (~> 0.6.3, >= 0.6.3) @@ -112,13 +113,12 @@ GEM uuidtools (>= 2.1.0) headless (1.0.2) highline (1.6.21) - hike (1.2.3) 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.2) + json (1.8.3) jwt (0.1.13) multi_json (>= 1.5) launchy (2.4.3) @@ -132,14 +132,14 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) metaclass (0.0.4) - mime-types (2.4.3) + mime-types (2.6.1) mini_portile (0.6.2) - minitest (5.5.1) + minitest (5.7.0) mocha (1.1.0) metaclass (~> 0.0.1) morrisjs-rails (0.5.1) railties (> 3.1, < 5) - multi_json (1.10.1) + multi_json (1.11.1) multipart-post (1.2.0) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -164,25 +164,25 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - rack (1.5.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.9) - actionmailer (= 4.1.9) - actionpack (= 4.1.9) - actionview (= 4.1.9) - activemodel (= 4.1.9) - activerecord (= 4.1.9) - activesupport (= 4.1.9) + 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.9) + railties (= 4.1.12) sprockets-rails (~> 2.0) rails-perftest (0.0.5) - railties (4.1.9) - actionpack (= 4.1.9) - activesupport (= 4.1.9) + railties (4.1.12) + actionpack (= 4.1.12) + activesupport (= 4.1.12) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -220,22 +220,18 @@ GEM simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slop (3.6.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.2.0) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) sshkey (1.6.1) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -256,9 +252,10 @@ PLATFORMS DEPENDENCIES RedCloth + activerecord-nulldb-adapter andand angularjs-rails - arvados (>= 0.1.20150210011250) + arvados (>= 0.1.20150511150219) bootstrap-sass (~> 3.1.0) bootstrap-tab-history-rails bootstrap-x-editable-rails @@ -292,7 +289,6 @@ DEPENDENCIES selenium-webdriver simplecov (~> 0.7) simplecov-rcov - sqlite3 sshkey themes_for_rails! therubyracer