projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3052-crunch-log-stdout' into 3769-throttle-logs
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index c734ab560b17b6517125cb5118c1904afd958d3b..bb327d05576d7374d51647ffb066785000087276 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-1,12
+1,12
@@
GEM
remote: https://rubygems.org/
specs:
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.1
5
)
- actionpack (= 3.2.1
5
)
+ actionmailer (3.2.1
7
)
+ actionpack (= 3.2.1
7
)
mail (~> 2.5.4)
mail (~> 2.5.4)
- actionpack (3.2.1
5
)
- activemodel (= 3.2.1
5
)
- activesupport (= 3.2.1
5
)
+ actionpack (3.2.1
7
)
+ activemodel (= 3.2.1
7
)
+ activesupport (= 3.2.1
7
)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@
-14,33
+14,41
@@
GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.1
5
)
- activesupport (= 3.2.1
5
)
+ activemodel (3.2.1
7
)
+ activesupport (= 3.2.1
7
)
builder (~> 3.0.0)
builder (~> 3.0.0)
- activerecord (3.2.1
5
)
- activemodel (= 3.2.1
5
)
- activesupport (= 3.2.1
5
)
+ activerecord (3.2.1
7
)
+ activemodel (= 3.2.1
7
)
+ activesupport (= 3.2.1
7
)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.1
5
)
- activemodel (= 3.2.1
5
)
- activesupport (= 3.2.1
5
)
- activesupport (3.2.1
5
)
+ activeresource (3.2.1
7
)
+ activemodel (= 3.2.1
7
)
+ activesupport (= 3.2.1
7
)
+ activesupport (3.2.1
7
)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
- acts_as_api (0.4.
1
)
+ acts_as_api (0.4.
2
)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.3.
5
)
+ addressable (2.3.
6
)
andand (1.3.3)
andand (1.3.3)
- arel (3.0.2)
- arvados-cli (0.1.20140311162926)
+ arel (3.0.3)
+ arvados (0.1.20140919104705)
+ activesupport (>= 3.2.13)
+ andand
+ google-api-client (~> 0.6.3)
+ json (>= 1.7.7)
+ jwt (>= 0.1.5, < 1.0.0)
+ arvados-cli (0.1.20140919104705)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
+ arvados (~> 0.1.0)
curb (~> 0.8)
google-api-client (~> 0.6.3)
json (~> 1.7, >= 1.7.7)
curb (~> 0.8)
google-api-client (~> 0.6.3)
json (~> 1.7, >= 1.7.7)
+ jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
autoparse (0.3.3)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
autoparse (0.3.3)
@@
-60,14
+68,24
@@
GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.6.3)
- curb (0.8.5)
- daemon_controller (1.1.7)
+ coffee-script-source (1.7.0)
+ curb (0.8.6)
+ daemon_controller (1.2.0)
+ database_cleaner (1.2.0)
erubis (2.7.0)
erubis (2.7.0)
+ eventmachine (1.0.3)
execjs (2.0.2)
extlib (0.9.16)
execjs (2.0.2)
extlib (0.9.16)
- faraday (0.8.8)
+ factory_girl (4.4.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (4.4.1)
+ factory_girl (~> 4.4.0)
+ railties (>= 3.0.0)
+ faraday (0.8.9)
multipart-post (~> 1.2.0)
multipart-post (~> 1.2.0)
+ faye-websocket (0.7.2)
+ eventmachine (>= 0.12.0)
+ websocket-driver (>= 0.3.1)
google-api-client (0.6.4)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
google-api-client (0.6.4)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
@@
-79,16
+97,16
@@
GEM
signet (~> 0.4.5)
uuidtools (>= 2.1.0)
hashie (1.2.0)
signet (~> 0.4.5)
uuidtools (>= 2.1.0)
hashie (1.2.0)
- highline (1.6.2
0
)
+ highline (1.6.2
1
)
hike (1.2.3)
hike (1.2.3)
- httpauth (0.2.
0
)
- i18n (0.6.
5
)
+ httpauth (0.2.
1
)
+ i18n (0.6.
11
)
journey (1.0.4)
journey (1.0.4)
- jquery-rails (3.
0.4
)
+ jquery-rails (3.
1.0
)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
- jwt (0.1.
8
)
+ jwt (0.1.
13
)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
@@
-96,14
+114,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)
- mime-types (1.25)
- multi_json (1.
8.2
)
+ mime-types (1.25
.1
)
+ multi_json (1.
10.1
)
multipart-post (1.2.0)
multipart-post (1.2.0)
- net-scp (1.
1.2
)
+ net-scp (1.
2.0
)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.
7
.0)
+ net-ssh (2.
8
.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
oauth2 (0.8.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
oauth2 (0.8.1)
@@
-112,49
+130,53
@@
GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
- oj (2.1
.7
)
+ oj (2.1
0.2
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
- passenger (4.0.
23
)
- daemon_controller (>= 1.
1
.0)
+ passenger (4.0.
41
)
+ daemon_controller (>= 1.
2
.0)
rack
rake (>= 0.8.1)
rack
rake (>= 0.8.1)
- pg (0.17.0)
- polyglot (0.3.3)
+ pg (0.17.1)
+ pg_power (1.6.4)
+ pg
+ rails (~> 3.1)
+ polyglot (0.3.4)
+ puma (2.8.2)
+ rack (>= 1.1, < 2.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.
3
)
+ rack-ssl (1.3.
4
)
rack
rack-test (0.6.2)
rack (>= 1.0)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.1
5
)
- actionmailer (= 3.2.1
5
)
- actionpack (= 3.2.1
5
)
- activerecord (= 3.2.1
5
)
- activeresource (= 3.2.1
5
)
- activesupport (= 3.2.1
5
)
+ rails (3.2.1
7
)
+ actionmailer (= 3.2.1
7
)
+ actionpack (= 3.2.1
7
)
+ activerecord (= 3.2.1
7
)
+ activeresource (= 3.2.1
7
)
+ activesupport (= 3.2.1
7
)
bundler (~> 1.0)
bundler (~> 1.0)
- railties (= 3.2.1
5
)
- railties (3.2.1
5
)
- actionpack (= 3.2.1
5
)
- activesupport (= 3.2.1
5
)
+ railties (= 3.2.1
7
)
+ railties (3.2.1
7
)
+ actionpack (= 3.2.1
7
)
+ activesupport (= 3.2.1
7
)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.
1.0
)
+ rake (10.
2.2
)
rdoc (3.12.2)
json (~> 1.4)
rdoc (3.12.2)
json (~> 1.4)
- redis (3.0.5)
ref (1.0.5)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
ref (1.0.5)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
- sass (3.
2.12
)
+ sass (3.
3.4
)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@
-164,27
+186,36
@@
GEM
faraday (~> 0.8.1)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
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)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.8)
- test_after_commit (0.2.2)
- therubyracer (0.12.0)
+ sshkey (1.6.1)
+ test_after_commit (0.2.3)
+ themes_for_rails (0.5.1)
+ rails (>= 3.0.0)
+ therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
libv8 (~> 3.16.14.0)
ref
- thor (0.1
8
.1)
+ thor (0.1
9
.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
trollop (2.0)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
trollop (2.0)
- tzinfo (0.3.3
8
)
- uglifier (2.
3
.0)
+ tzinfo (0.3.3
9
)
+ uglifier (2.
5
.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
- uuidtools (2.1.4)
+ uuidtools (2.1.5)
+ websocket-driver (0.3.2)
PLATFORMS
ruby
PLATFORMS
ruby
@@
-192,8
+223,12
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados-cli (>= 0.1.20140311162926)
+ arvados (>= 0.1.20140919104705)
+ arvados-cli (>= 0.1.20140919104705)
coffee-rails (~> 3.2.0)
coffee-rails (~> 3.2.0)
+ database_cleaner
+ factory_girl_rails
+ faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
multi_json
google-api-client (~> 0.6.3)
jquery-rails
multi_json
@@
-202,12
+237,16
@@
DEPENDENCIES
omniauth-oauth2 (= 1.1.1)
passenger
pg
omniauth-oauth2 (= 1.1.1)
passenger
pg
+ pg_power
+ puma
rails (~> 3.2.0)
rails (~> 3.2.0)
- redis
rvm-capistrano
sass-rails (>= 3.2.0)
rvm-capistrano
sass-rails (>= 3.2.0)
- sqlite3
+ simplecov (~> 0.7.1)
+ simplecov-rcov
+ sshkey
test_after_commit
test_after_commit
+ themes_for_rails
therubyracer
trollop
uglifier (>= 1.0.3)
therubyracer
trollop
uglifier (>= 1.0.3)