projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4363-less-filename-munging' closes #4363
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index a09f950636adbdbcc8a030235ff6234422451fac..ce79f854dea56e3006fe049ee52988c690839ded 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,18
+35,20
@@
GEM
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.20140
414145041
)
+ arvados (0.1.20140
919104705
)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
- arvados-cli (0.1.20140414145041)
+ jwt (>= 0.1.5, < 1.0.0)
+ arvados-cli (0.1.20141014201516)
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)
+ arvados (~> 0.1
, >= 0.1
.0)
curb (~> 0.8)
curb (~> 0.8)
- google-api-client (~> 0.6.3)
+ google-api-client (~> 0.6
, >= 0.6
.3)
json (~> 1.7, >= 1.7.7)
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)
@@
-67,13
+69,18
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
- curb (0.8.
5
)
+ curb (0.8.
6
)
daemon_controller (1.2.0)
database_cleaner (1.2.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
extlib (0.9.16)
daemon_controller (1.2.0)
database_cleaner (1.2.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
extlib (0.9.16)
+ 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)
faye-websocket (0.7.2)
faraday (0.8.9)
multipart-post (~> 1.2.0)
faye-websocket (0.7.2)
@@
-93,13
+100,13
@@
GEM
highline (1.6.21)
hike (1.2.3)
httpauth (0.2.1)
highline (1.6.21)
hike (1.2.3)
httpauth (0.2.1)
- i18n (0.6.
9
)
+ i18n (0.6.
11
)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
- jwt (0.1.1
1
)
+ jwt (0.1.1
3
)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
@@
-108,7
+115,7
@@
GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
- multi_json (1.
9.2
)
+ multi_json (1.
10.1
)
multipart-post (1.2.0)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
multipart-post (1.2.0)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
@@
-123,7
+130,7
@@
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.
7.3
)
+ oj (2.
10.2
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-139,6
+146,8
@@
GEM
pg
rails (~> 3.1)
polyglot (0.3.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)
@@
-164,7
+173,6
@@
GEM
rake (10.2.2)
rdoc (3.12.2)
json (~> 1.4)
rake (10.2.2)
rdoc (3.12.2)
json (~> 1.4)
- redis (3.0.7)
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)
@@
-178,12
+186,18
@@
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)
- s
qlite3 (1.3.9
)
+ s
shkey (1.6.1
)
test_after_commit (0.2.3)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
test_after_commit (0.2.3)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
@@
-200,7
+214,7
@@
GEM
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
- uuidtools (2.1.
4
)
+ uuidtools (2.1.
5
)
websocket-driver (0.3.2)
PLATFORMS
websocket-driver (0.3.2)
PLATFORMS
@@
-209,9
+223,11
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados-cli (>= 0.1.20140328152103)
+ arvados (>= 0.1.20140919104705)
+ arvados-cli (>= 0.1.20141014201516)
coffee-rails (~> 3.2.0)
database_cleaner
coffee-rails (~> 3.2.0)
database_cleaner
+ factory_girl_rails
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
@@
-222,11
+238,13
@@
DEPENDENCIES
passenger
pg
pg_power
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
themes_for_rails
therubyracer
test_after_commit
themes_for_rails
therubyracer