projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add boilerplate for Project resource
[arvados.git]
/
Gemfile.lock
diff --git
a/Gemfile.lock
b/Gemfile.lock
index f4ffdc5bcb0ff2f7fe6b4263f28d56edd3949ce0..0870fce8872d21577075dae54ef64b9fc3313c6d 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-29,9
+29,13
@@
GEM
activesupport (= 3.1.5)
activesupport (3.1.5)
multi_json (>= 1.0, < 1.3)
activesupport (= 3.1.5)
activesupport (3.1.5)
multi_json (>= 1.0, < 1.3)
+ acts_as_api (0.4.1)
+ activemodel (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ rack (>= 1.1.0)
arel (2.2.3)
arel (2.2.3)
- builder (3.0.
3
)
- capistrano (2.1
2.0
)
+ builder (3.0.
4
)
+ capistrano (2.1
4.1
)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@
-43,18
+47,20
@@
GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ 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)
- highline (1.6.11)
+ fastthread (1.0.7)
+ highline (1.6.15)
hike (1.2.1)
i18n (0.6.1)
hike (1.2.1)
i18n (0.6.1)
- jquery-rails (2.1.
3
)
- railties (>= 3.
1.
0, < 5.0)
- thor (
~> 0.14
)
- json (1.7.
5
)
- libv8 (3.
3.10.4
)
+ jquery-rails (2.1.
4
)
+ railties (>= 3.0, < 5.0)
+ thor (
>= 0.14, < 2.0
)
+ json (1.7.
6
)
+ libv8 (3.
11.8.13
)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@
-65,12
+71,17
@@
GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.
3.0
)
+ net-ssh (2.
6.3
)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- pg (0.13.2)
+ 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)
polyglot (0.3.3)
- rack (1.3.
6
)
+ 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)
@@
-94,29
+105,31
@@
GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (
0.9.2.2
)
+ rake (
10.0.3
)
rdoc (3.12)
json (~> 1.4)
rdoc (3.12)
json (~> 1.4)
+ ref (1.0.2)
rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
- sass (3.
2.
1)
- sass-rails (3.1.
6
)
+ sass (3.
1.2
1)
+ sass-rails (3.1.
5
)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (
>=
3.1.10)
+ sass (
~>
3.1.10)
tilt (~> 1.3.2)
sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
tilt (~> 1.3.2)
sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.10.2)
- libv8 (~> 3.3.10)
+ therubyracer (0.11.2)
+ libv8 (~> 3.11.8.12)
+ ref
thor (0.14.6)
tilt (1.3.3)
thor (0.14.6)
tilt (1.3.3)
- treetop (1.4.1
1
)
+ treetop (1.4.1
2
)
polyglot
polyglot (>= 0.3.1)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.3
3
)
+ tzinfo (0.3.3
5
)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@
-125,12
+138,14
@@
PLATFORMS
ruby
DEPENDENCIES
ruby
DEPENDENCIES
+ acts_as_api
coffee-rails (~> 3.1.1)
jquery-rails
json
coffee-rails (~> 3.1.1)
jquery-rails
json
+ passenger
pg
rails (= 3.1.5)
rvm-capistrano
pg
rails (= 3.1.5)
rvm-capistrano
- sass-rails (
~>
3.1.5)
+ sass-rails (
=
3.1.5)
therubyracer
uglifier (>= 1.0.3)
therubyracer
uglifier (>= 1.0.3)