projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2291-new-keepd-read-blocks'
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 5e53ef1cc472613391a776acdf44024207f76a50..0c65ca80ffb3d764d6446d4ce714e551a90eb3b1 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-30,12
+30,11
@@
GEM
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
andand (1.3.3)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
andand (1.3.3)
- anjlab-bootstrap-rails (2.3.1.2)
- railties (>= 3.0)
- sass (>= 3.2)
arel (3.0.2)
arel (3.0.2)
- bootstrap-editable-rails (0.0.5)
- railties (>= 3.1)
+ bootstrap-sass (3.1.0.1)
+ sass (~> 3.2)
+ bootstrap-x-editable-rails (1.5.1.1)
+ railties (>= 3.0)
builder (3.0.4)
capistrano (2.15.5)
highline
builder (3.0.4)
capistrano (2.15.5)
highline
@@
-43,6
+42,15
@@
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.2.1)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ xpath (~> 2.0)
+ childprocess (0.5.1)
+ ffi (~> 1.0, >= 1.0.11)
+ cliver (0.3.2)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@
-52,8
+60,10
@@
GEM
coffee-script-source (1.6.3)
commonjs (0.2.7)
daemon_controller (1.1.7)
coffee-script-source (1.6.3)
commonjs (0.2.7)
daemon_controller (1.1.7)
+ deep_merge (1.0.1)
erubis (2.7.0)
execjs (2.0.2)
erubis (2.7.0)
execjs (2.0.2)
+ ffi (1.9.3)
highline (1.6.20)
hike (1.2.3)
httpclient (2.3.4.1)
highline (1.6.20)
hike (1.2.3)
httpclient (2.3.4.1)
@@
-73,6
+83,7
@@
GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25)
+ mini_portile (0.5.2)
multi_json (1.8.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
multi_json (1.8.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
@@
-81,6
+92,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)
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)
@@
-90,6
+103,11
@@
GEM
actionpack
activesupport
rails (>= 3.0.0)
actionpack
activesupport
rails (>= 3.0.0)
+ poltergeist (1.5.0)
+ capybara (~> 2.1)
+ cliver (~> 0.3.1)
+ multi_json (~> 1.0)
+ websocket-driver (>= 0.2.0)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
@@
-117,6
+135,7
@@
GEM
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
+ rubyzip (1.1.0)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
sass (3.2.12)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
sass (3.2.12)
@@
-124,6
+143,11
@@
GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
+ selenium-webdriver (2.40.0)
+ childprocess (>= 0.5.0)
+ multi_json (~> 1.0)
+ rubyzip (~> 1.0)
+ websocket (~> 1.0.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@
-140,15
+164,14
@@
GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.2.8)
- actionpack (>= 3.1)
- execjs
- rails (>= 3.1)
- railties (>= 3.1)
tzinfo (0.3.38)
uglifier (2.3.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
tzinfo (0.3.38)
uglifier (2.3.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
+ websocket (1.0.7)
+ websocket-driver (0.3.2)
+ xpath (2.0.0)
+ nokogiri (~> 1.3)
PLATFORMS
ruby
PLATFORMS
ruby
@@
-156,9
+179,11
@@
PLATFORMS
DEPENDENCIES
RedCloth
andand
DEPENDENCIES
RedCloth
andand
- anjlab-bootstrap-rails (~> 2.3)
- bootstrap-editable-rails
+ bootstrap-sass (~> 3.1.0)
+ bootstrap-x-editable-rails
+ capybara
coffee-rails (~> 3.2.0)
coffee-rails (~> 3.2.0)
+ deep_merge
httpclient
jquery-rails
less
httpclient
jquery-rails
less
@@
-167,12
+192,13
@@
DEPENDENCIES
oj
passenger
piwik_analytics
oj
passenger
piwik_analytics
+ poltergeist
rails (~> 3.2.0)
rvm-capistrano
sass
sass-rails (~> 3.2.0)
rails (~> 3.2.0)
rvm-capistrano
sass
sass-rails (~> 3.2.0)
+ selenium-webdriver
sqlite3
themes_for_rails
therubyracer
sqlite3
themes_for_rails
therubyracer
- twitter-bootstrap-rails
uglifier (>= 1.0.3)
uglifier (>= 1.0.3)