projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4024-pipeline-instances-scroll
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 173be13cc3e312a64d8a10a5e183cb81f72957bf..53d42cb856e59903704b39e157bb118de6c4320f 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-36,20
+36,37
@@
GEM
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
+ addressable (2.3.6)
andand (1.3.3)
arel (5.0.1.20140414130214)
andand (1.3.3)
arel (5.0.1.20140414130214)
+ arvados (0.1.20140917180103)
+ activesupport (>= 3.2.13)
+ andand
+ google-api-client (~> 0.6.3)
+ json (>= 1.7.7)
+ jwt (>= 0.1.5, < 1.0.0)
+ autoparse (0.3.3)
+ addressable (>= 2.3.1)
+ extlib (>= 0.9.15)
+ multi_json (>= 1.0.0)
bootstrap-sass (3.1.0.1)
sass (~> 3.2)
bootstrap-sass (3.1.0.1)
sass (~> 3.2)
+ bootstrap-tab-history-rails (0.1.0)
+ railties (>= 3.1)
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
builder (3.2.2)
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
builder (3.2.2)
+ byebug (3.5.1)
+ columnize (~> 0.8)
+ debugger-linecache (~> 1.2)
+ slop (~> 3.6)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (2.
2.1
)
+ capybara (2.
4.4
)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@
-65,21
+82,40
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
+ columnize (0.8.9)
commonjs (0.2.7)
daemon_controller (1.1.7)
commonjs (0.2.7)
daemon_controller (1.1.7)
+ debugger-linecache (1.2.0)
deep_merge (1.0.1)
erubis (2.7.0)
execjs (2.0.2)
deep_merge (1.0.1)
erubis (2.7.0)
execjs (2.0.2)
+ extlib (0.9.16)
+ faraday (0.8.9)
+ multipart-post (~> 1.2.0)
ffi (1.9.3)
ffi (1.9.3)
+ 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)
headless (1.0.1)
highline (1.6.20)
hike (1.2.3)
headless (1.0.1)
highline (1.6.20)
hike (1.2.3)
- httpclient (2.
3.4.1
)
+ httpclient (2.
5.0
)
i18n (0.6.9)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
i18n (0.6.9)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
+ jwt (0.1.13)
+ multi_json (>= 1.5)
+ launchy (2.4.2)
+ addressable (~> 2.3)
less (2.4.0)
commonjs (~> 0.2.7)
less-rails (2.4.2)
less (2.4.0)
commonjs (~> 0.2.7)
less-rails (2.4.2)
@@
-89,10
+125,14
@@
GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ metaclass (0.0.4)
mime-types (1.25.1)
mime-types (1.25.1)
- mini_portile (0.
5.2
)
+ mini_portile (0.
6.0
)
minitest (5.3.3)
minitest (5.3.3)
+ mocha (1.1.0)
+ metaclass (~> 0.0.1)
multi_json (1.10.0)
multi_json (1.10.0)
+ multipart-post (1.2.0)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
@@
-100,8
+140,8
@@
GEM
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- nokogiri (1.6.1)
- mini_portile (
~> 0.5
.0)
+ nokogiri (1.6.
3.
1)
+ mini_portile (
= 0.6
.0)
oj (2.1.7)
passenger (4.0.23)
daemon_controller (>= 1.1.0)
oj (2.1.7)
passenger (4.0.23)
daemon_controller (>= 1.1.0)
@@
-137,6
+177,7
@@
GEM
thor (>= 0.18.1, < 2.0)
rake (10.3.1)
ref (1.0.5)
thor (>= 0.18.1, < 2.0)
rake (10.3.1)
ref (1.0.5)
+ ruby-debug-passenger (0.2.0)
rubyzip (1.1.0)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
rubyzip (1.1.0)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
@@
-151,12
+192,18
@@
GEM
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
+ 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)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
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 (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
@@
-167,6
+214,7
@@
GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.8)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.8)
+ sshkey (1.6.1)
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
@@
-181,8
+229,10
@@
GEM
uglifier (2.3.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (2.3.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
+ uuidtools (2.1.5)
websocket (1.0.7)
websocket-driver (0.3.2)
websocket (1.0.7)
websocket-driver (0.3.2)
+ wiselinks (1.2.1)
xpath (2.0.0)
nokogiri (~> 1.3)
xpath (2.0.0)
nokogiri (~> 1.3)
@@
-192,23
+242,28
@@
PLATFORMS
DEPENDENCIES
RedCloth
andand
DEPENDENCIES
RedCloth
andand
+ arvados (>= 0.1.20140917180103)
bootstrap-sass (~> 3.1.0)
bootstrap-sass (~> 3.1.0)
+ bootstrap-tab-history-rails
bootstrap-x-editable-rails
bootstrap-x-editable-rails
+ byebug
capybara
coffee-rails
deep_merge
headless
capybara
coffee-rails
deep_merge
headless
- httpclient
+ httpclient
(~> 2.5.0)
jquery-rails
less
less-rails
minitest (>= 5.0.0)
jquery-rails
less
less-rails
minitest (>= 5.0.0)
+ mocha
multi_json
oj
passenger
piwik_analytics
poltergeist
rails (~> 4.1.0)
multi_json
oj
passenger
piwik_analytics
poltergeist
rails (~> 4.1.0)
+ ruby-debug-passenger
rvm-capistrano
sass
sass-rails
rvm-capistrano
sass
sass-rails
@@
-216,6
+271,8
@@
DEPENDENCIES
simplecov (~> 0.7.1)
simplecov-rcov
sqlite3
simplecov (~> 0.7.1)
simplecov-rcov
sqlite3
+ sshkey
themes_for_rails!
therubyracer
uglifier (>= 1.0.3)
themes_for_rails!
therubyracer
uglifier (>= 1.0.3)
+ wiselinks