projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix exception in get_all_logins when user has no authorized_keys
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index b41c98354cecf531bc87f86c1b1005b74fce2b96..83a324cf3b05ff925c2eb00277dc0c8f900b21ec 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-36,7
+36,7
@@
GEM
andand (1.3.3)
arel (2.2.3)
builder (3.0.4)
andand (1.3.3)
arel (2.2.3)
builder (3.0.4)
- capistrano (2.1
4.1
)
+ capistrano (2.1
5.4
)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@
-48,66
+48,64
@@
GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.
4.0
)
- daemon_controller (1.1.
0
)
+ coffee-script-source (1.
6.2
)
+ daemon_controller (1.1.
4
)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- faraday (0.8.
4
)
+ faraday (0.8.
7
)
multipart-post (~> 1.1)
multipart-post (~> 1.1)
- fastthread (1.0.7)
hashie (1.2.0)
hashie (1.2.0)
- highline (1.6.1
5
)
- hike (1.2.
1
)
+ highline (1.6.1
9
)
+ hike (1.2.
3
)
httpauth (0.2.0)
httpauth (0.2.0)
- i18n (0.6.
1
)
- jquery-rails (
2.1.4
)
+ i18n (0.6.
4
)
+ jquery-rails (
3.0.1
)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.
7.6
)
- jwt (0.1.
5
)
+ json (1.
8.0
)
+ jwt (0.1.
6
)
multi_json (>= 1.0)
multi_json (>= 1.0)
- libv8 (3.11.8.1
3
)
+ libv8 (3.11.8.1
7
)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.
19
)
+ mime-types (1.
23
)
multi_json (1.2.0)
multi_json (1.2.0)
- multipart-post (1.
1.5
)
- net-scp (1.
0.4
)
- net-ssh (>=
1.99.1
)
- net-sftp (2.
0.5
)
- net-ssh (>= 2.
0.9
)
- net-ssh (2.6.
3
)
- net-ssh-gateway (1.
1
.0)
- net-ssh (>=
1.99.1
)
- oauth2 (0.8.
0
)
+ multipart-post (1.
2.0
)
+ net-scp (1.
1.1
)
+ net-ssh (>=
2.6.5
)
+ net-sftp (2.
1.2
)
+ net-ssh (>= 2.
6.5
)
+ net-ssh (2.6.
7
)
+ net-ssh-gateway (1.
2
.0)
+ net-ssh (>=
2.6.5
)
+ oauth2 (0.8.
1
)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
- oj (2.
0.3
)
+ oj (2.
1.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 (3.0.19)
- daemon_controller (>= 1.0.0)
- fastthread (>= 1.0.1)
+ passenger (4.0.5)
+ daemon_controller (>= 1.1.0)
rack
rake (>= 0.8.1)
rack
rake (>= 0.8.1)
- pg (0.1
4
.1)
+ pg (0.1
5
.1)
polyglot (0.3.3)
polyglot (0.3.3)
- rack (1.3.
9
)
+ rack (1.3.
10
)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-ssl (1.3.
2
)
+ rack-ssl (1.3.
3
)
rack
rack-test (0.6.2)
rack (>= 1.0)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@
-126,11
+124,12
@@
GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (10.
0.3
)
- rdoc (3.12)
+ rake (10.
1.0
)
+ rdoc (3.12
.2
)
json (~> 1.4)
json (~> 1.4)
- ref (1.0.2)
- rvm-capistrano (1.2.7)
+ redis (3.0.4)
+ ref (1.0.5)
+ rvm-capistrano (1.3.2)
capistrano (>= 2.0.0)
sass (3.1.21)
sass-rails (3.1.5)
capistrano (>= 2.0.0)
sass (3.1.21)
sass-rails (3.1.5)
@@
-142,16
+141,16
@@
GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.11.
3
)
+ therubyracer (0.11.
4
)
libv8 (~> 3.11.8.12)
ref
thor (0.14.6)
libv8 (~> 3.11.8.12)
ref
thor (0.14.6)
- tilt (1.3.
3
)
- treetop (1.4.1
2
)
+ tilt (1.3.
7
)
+ treetop (1.4.1
4
)
polyglot
polyglot (>= 0.3.1)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.3
5
)
- uglifier (
1.3.0
)
+ tzinfo (0.3.3
7
)
+ uglifier (
2.1.1
)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@
-170,6
+169,7
@@
DEPENDENCIES
passenger
pg
rails (= 3.1.10)
passenger
pg
rails (= 3.1.10)
+ redis
rvm-capistrano
sass-rails (= 3.1.5)
therubyracer
rvm-capistrano
sass-rails (= 3.1.5)
therubyracer