projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9767-workflows-in-chooser
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index d29c16ea4973020ffbb32d60ad6d7d54261116c2..03bbbce0614eb37411ac993ea1d8af0d2f3bbdeb 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-1,7
+1,6
@@
GIT
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)
specs:
themes_for_rails (0.5.1)
rails (>= 3.0.0)
@@
-10,42
+9,45
@@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (4.1.
8
)
- actionpack (= 4.1.
8
)
- actionview (= 4.1.
8
)
+ actionmailer (4.1.
12
)
+ actionpack (= 4.1.
12
)
+ actionview (= 4.1.
12
)
mail (~> 2.5, >= 2.5.4)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.
8
)
- actionview (= 4.1.
8
)
- activesupport (= 4.1.
8
)
+ actionpack (4.1.
12
)
+ actionview (= 4.1.
12
)
+ activesupport (= 4.1.
12
)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- actionview (4.1.
8
)
- activesupport (= 4.1.
8
)
+ actionview (4.1.
12
)
+ activesupport (= 4.1.
12
)
builder (~> 3.1)
erubis (~> 2.7.0)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.
8
)
- activesupport (= 4.1.
8
)
+ activemodel (4.1.
12
)
+ activesupport (= 4.1.
12
)
builder (~> 3.1)
builder (~> 3.1)
- activerecord (4.1.
8
)
- activemodel (= 4.1.
8
)
- activesupport (= 4.1.
8
)
+ activerecord (4.1.
12
)
+ activemodel (= 4.1.
12
)
+ activesupport (= 4.1.
12
)
arel (~> 5.0.0)
arel (~> 5.0.0)
- activesupport (4.1.8)
+ 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)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
- addressable (2.
3.6
)
+ addressable (2.
4.0
)
andand (1.3.3)
andand (1.3.3)
- angularjs-rails (1.3.
3
)
+ angularjs-rails (1.3.
8
)
arel (5.0.1.20140414130214)
arel (5.0.1.20140414130214)
- arvados (0.1.201
41114230720
)
- activesupport (>= 3
.2.13
)
+ arvados (0.1.201
60420143004
)
+ activesupport (>= 3
, < 4.2.6
)
andand (~> 1.3, >= 1.3.3)
andand (~> 1.3, >= 1.3.3)
- google-api-client (~> 0.6.3, >= 0.6.3)
+ google-api-client (>= 0.7, < 0.9)
+ i18n (~> 0)
json (~> 1.7, >= 1.7.7)
json (~> 1.7, >= 1.7.7)
- jwt (>= 0.1.5, <
1.0.0
)
+ jwt (>= 0.1.5, <
2
)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
@@
-67,13
+69,13
@@
GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
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)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- childprocess (0.5.
5
)
+ childprocess (0.5.
6
)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
coffee-rails (4.1.0)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
coffee-rails (4.1.0)
@@
-83,38
+85,51
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.8.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
- columnize (0.
8.9
)
+ columnize (0.
9.0
)
commonjs (0.2.7)
daemon_controller (1.2.0)
debugger-linecache (1.2.0)
deep_merge (1.0.1)
commonjs (0.2.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.2.2)
extlib (0.9.16)
erubis (2.7.0)
execjs (2.2.2)
extlib (0.9.16)
- faraday (0.8.9)
- multipart-post (~> 1.2.0)
- ffi (1.9.6)
- google-api-client (0.6.4)
- addressable (>= 2.3.2)
- autoparse (>= 0.3.3)
- extlib (>= 0.9.15)
- faraday (~> 0.8.4)
- jwt (>= 0.1.5)
- launchy (>= 2.1.1)
- multi_json (>= 1.0.0)
- signet (~> 0.4.5)
- uuidtools (>= 2.1.0)
+ faraday (0.9.2)
+ multipart-post (>= 1.2, < 3)
+ fast_stack (0.1.0)
+ rake
+ rake-compiler
+ ffi (1.9.10)
+ flamegraph (0.1.0)
+ fast_stack
+ google-api-client (0.8.6)
+ activesupport (>= 3.2)
+ addressable (~> 2.3)
+ autoparse (~> 0.3)
+ extlib (~> 0.9)
+ faraday (~> 0.9)
+ googleauth (~> 0.3)
+ launchy (~> 2.4)
+ multi_json (~> 1.10)
+ retriable (~> 1.4)
+ signet (~> 0.6)
+ googleauth (0.5.1)
+ faraday (~> 0.9)
+ jwt (~> 1.4)
+ logging (~> 2.0)
+ memoist (~> 0.12)
+ multi_json (~> 1.11)
+ os (~> 0.9)
+ signet (~> 0.7)
headless (1.0.2)
highline (1.6.21)
headless (1.0.2)
highline (1.6.21)
- hike (1.2.3)
- httpclient (2.5.3.3)
- i18n (0.6.11)
+ httpclient (2.6.0.1)
+ i18n (0.7.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.1)
- jwt (0.1.13)
- multi_json (>= 1.5)
+ json (1.8.3)
+ jwt (1.5.4)
launchy (2.4.3)
addressable (~> 2.3)
less (2.6.0)
launchy (2.4.3)
addressable (~> 2.3)
less (2.6.0)
@@
-123,29
+138,40
@@
GEM
actionpack (>= 3.1)
less (~> 2.6.0)
libv8 (3.16.14.7)
actionpack (>= 3.1)
less (~> 2.6.0)
libv8 (3.16.14.7)
+ little-plugger (1.1.4)
+ 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)
mail (2.6.3)
mime-types (>= 1.16, < 3)
+ memoist (0.14.0)
metaclass (0.0.4)
metaclass (0.0.4)
- mime-types (2.
4.3
)
- mini_portile (0.6.
1
)
- minitest (5.
4.3
)
+ mime-types (2.
99
)
+ mini_portile (0.6.
2
)
+ minitest (5.
8.4
)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
railties (> 3.1, < 5)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
railties (> 3.1, < 5)
- multi_json (1.1
0.1
)
- multipart-post (
1.2
.0)
+ multi_json (1.1
2.0
)
+ multipart-post (
2.0
.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.9.
1
)
+ net-ssh (2.9.
2
)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- nokogiri (1.6.
4.1
)
+ nokogiri (1.6.
6.4
)
mini_portile (~> 0.6.0)
mini_portile (~> 0.6.0)
- oj (2.11.1)
- passenger (4.0.53)
+ oj (2.11.2)
+ os (0.9.6)
+ passenger (4.0.57)
daemon_controller (>= 1.2.0)
rack
rake (>= 0.8.1)
daemon_controller (>= 1.2.0)
rack
rake (>= 0.8.1)
@@
-158,81
+184,85
@@
GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- 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)
rack (>= 1.0)
- rails (4.1.
8
)
- actionmailer (= 4.1.
8
)
- actionpack (= 4.1.
8
)
- actionview (= 4.1.
8
)
- activemodel (= 4.1.
8
)
- activerecord (= 4.1.
8
)
- activesupport (= 4.1.
8
)
+ 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)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.
8
)
+ railties (= 4.1.
12
)
sprockets-rails (~> 2.0)
rails-perftest (0.0.5)
sprockets-rails (~> 2.0)
rails-perftest (0.0.5)
- railties (4.1.
8
)
- actionpack (= 4.1.
8
)
- activesupport (= 4.1.
8
)
+ railties (4.1.
12
)
+ actionpack (= 4.1.
12
)
+ activesupport (= 4.1.
12
)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.4.0)
+ rake (10.4.2)
+ rake-compiler (0.9.5)
+ rake
raphael-rails (2.1.2)
ref (1.0.5)
raphael-rails (2.1.2)
ref (1.0.5)
+ retriable (1.4.1)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
- rubyzip (1.1.
6
)
+ rubyzip (1.1.
7
)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
- sass (3.
2.1
9)
- sass-rails (
4.0.4
)
+ sass (3.
4.
9)
+ sass-rails (
5.0.1
)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.2)
- sprockets (~> 2.8, < 2.12)
- sprockets-rails (~> 2.0)
- selenium-webdriver (2.44.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (~> 1.1)
+ selenium-webdriver (2.53.1)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
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)
+ signet (0.7.2)
+ addressable (~> 2.3)
+ faraday (~> 0.9)
+ jwt (~> 1.5)
+ multi_json (~> 1.10)
+ simplecov (0.9.1)
+ docile (~> 1.1.0)
multi_json (~> 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)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.6.0)
- sprockets (2.11.3)
- hike (~> 1.2)
- multi_json (~> 1.0)
+ sprockets (3.2.0)
rack (~> 1.0)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.2.0)
+ sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
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)
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)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uglifier (2.
5.3
)
+ uglifier (2.
7.0
)
execjs (>= 0.3.0)
json (>= 1.8.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
- uuidtools (2.1.5)
- websocket (1.2.1)
- websocket-driver (0.4.0)
+ 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)
wiselinks (1.2.1)
xpath (2.0.0)
nokogiri (~> 1.3)
@@
-242,9
+272,10
@@
PLATFORMS
DEPENDENCIES
RedCloth
DEPENDENCIES
RedCloth
+ activerecord-nulldb-adapter
andand
angularjs-rails
andand
angularjs-rails
- arvados (>= 0.1.201
41114230720
)
+ arvados (>= 0.1.201
50511150219
)
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
@@
-252,11
+283,14
@@
DEPENDENCIES
capybara
coffee-rails
deep_merge
capybara
coffee-rails
deep_merge
+ flamegraph
headless
headless
- httpclient (~> 2.5
.0
)
+ httpclient (~> 2.5)
jquery-rails
less
less-rails
jquery-rails
less
less-rails
+ lograge
+ logstash-event
minitest (>= 5.0.0)
mocha
morrisjs-rails
minitest (>= 5.0.0)
mocha
morrisjs-rails
@@
-265,6
+299,7
@@
DEPENDENCIES
passenger
piwik_analytics
poltergeist
passenger
piwik_analytics
poltergeist
+ rack-mini-profiler
rails (~> 4.1.0)
rails-perftest
raphael-rails
rails (~> 4.1.0)
rails-perftest
raphael-rails
@@
-272,13
+307,15
@@
DEPENDENCIES
ruby-prof
rvm-capistrano
sass
ruby-prof
rvm-capistrano
sass
- sass-rails
(~> 4.0.4)
+ sass-rails
selenium-webdriver
selenium-webdriver
- simplecov (~> 0.7
.1
)
+ simplecov (~> 0.7)
simplecov-rcov
simplecov-rcov
- sqlite3
sshkey
themes_for_rails!
therubyracer
uglifier (>= 1.0.3)
wiselinks
sshkey
themes_for_rails!
therubyracer
uglifier (>= 1.0.3)
wiselinks
+
+BUNDLED WITH
+ 1.12.1