projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix login bug
[arvados.git]
/
Gemfile.lock
diff --git
a/Gemfile.lock
b/Gemfile.lock
index b081b16792a6ec11a0424a0ab94e1621e3227dfa..11878f2df72727df5832c32d09be777db5ec3fef 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-1,12
+1,12
@@
GEM
remote: http://rubygems.org/
specs:
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.
5
)
- actionpack (= 3.1.
5
)
+ actionmailer (3.1.
10
)
+ actionpack (= 3.1.
10
)
mail (~> 2.3.3)
mail (~> 2.3.3)
- actionpack (3.1.
5
)
- activemodel (= 3.1.
5
)
- activesupport (= 3.1.
5
)
+ actionpack (3.1.
10
)
+ activemodel (= 3.1.
10
)
+ activesupport (= 3.1.
10
)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
@@
-15,19
+15,19
@@
GEM
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
- activemodel (3.1.
5
)
- activesupport (= 3.1.
5
)
+ activemodel (3.1.
10
)
+ activesupport (= 3.1.
10
)
builder (~> 3.0.0)
i18n (~> 0.6)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.
5
)
- activemodel (= 3.1.
5
)
- activesupport (= 3.1.
5
)
+ activerecord (3.1.
10
)
+ activemodel (= 3.1.
10
)
+ activesupport (= 3.1.
10
)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activeresource (3.1.
5
)
- activemodel (= 3.1.
5
)
- activesupport (= 3.1.
5
)
- activesupport (3.1.
5
)
+ activeresource (3.1.
10
)
+ activemodel (= 3.1.
10
)
+ activesupport (= 3.1.
10
)
+ activesupport (3.1.
10
)
multi_json (>= 1.0, < 1.3)
acts_as_api (0.4.1)
activemodel (>= 3.0.0)
multi_json (>= 1.0, < 1.3)
acts_as_api (0.4.1)
activemodel (>= 3.0.0)
@@
-48,16
+48,24
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.4.0)
coffee-script-source
execjs
coffee-script-source (1.4.0)
+ daemon_controller (1.1.0)
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)
+ multipart-post (~> 1.1)
+ fastthread (1.0.7)
+ hashie (1.2.0)
highline (1.6.15)
hike (1.2.1)
highline (1.6.15)
hike (1.2.1)
+ httpauth (0.2.0)
i18n (0.6.1)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
i18n (0.6.1)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
+ jwt (0.1.5)
+ multi_json (>= 1.0)
libv8 (3.11.8.13)
mail (2.3.3)
i18n (>= 0.4.0)
libv8 (3.11.8.13)
mail (2.3.3)
i18n (>= 0.4.0)
@@
-65,6
+73,7
@@
GEM
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.2.0)
treetop (~> 1.4.8)
mime-types (1.19)
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-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
@@
-72,9
+81,26
@@
GEM
net-ssh (2.6.3)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
net-ssh (2.6.3)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
+ oauth2 (0.8.0)
+ faraday (~> 0.8)
+ httpauth (~> 0.1)
+ jwt (~> 0.1.4)
+ multi_json (~> 1.0)
+ rack (~> 1.2)
+ 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)
+ rack
+ rake (>= 0.8.1)
pg (0.14.1)
polyglot (0.3.3)
pg (0.14.1)
polyglot (0.3.3)
- rack (1.3.
8
)
+ rack (1.3.
9
)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
@@
-83,17
+109,17
@@
GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.
5
)
- actionmailer (= 3.1.
5
)
- actionpack (= 3.1.
5
)
- activerecord (= 3.1.
5
)
- activeresource (= 3.1.
5
)
- activesupport (= 3.1.
5
)
+ rails (3.1.
10
)
+ actionmailer (= 3.1.
10
)
+ actionpack (= 3.1.
10
)
+ activerecord (= 3.1.
10
)
+ activeresource (= 3.1.
10
)
+ activesupport (= 3.1.
10
)
bundler (~> 1.0)
bundler (~> 1.0)
- railties (= 3.1.
5
)
- railties (3.1.
5
)
- actionpack (= 3.1.
5
)
- activesupport (= 3.1.
5
)
+ railties (= 3.1.
10
)
+ railties (3.1.
10
)
+ actionpack (= 3.1.
10
)
+ activesupport (= 3.1.
10
)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@
-114,7
+140,7
@@
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.
2
)
+ therubyracer (0.11.
3
)
libv8 (~> 3.11.8.12)
ref
thor (0.14.6)
libv8 (~> 3.11.8.12)
ref
thor (0.14.6)
@@
-135,8
+161,11
@@
DEPENDENCIES
coffee-rails (~> 3.1.1)
jquery-rails
json
coffee-rails (~> 3.1.1)
jquery-rails
json
+ omniauth (= 1.1.1)
+ omniauth-oauth2 (= 1.1.1)
+ passenger
pg
pg
- rails (= 3.1.
5
)
+ rails (= 3.1.
10
)
rvm-capistrano
sass-rails (= 3.1.5)
therubyracer
rvm-capistrano
sass-rails (= 3.1.5)
therubyracer