projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dce1c65
)
update gems
author
Tom Clegg <tom@clinicalfuture.com>
Fri, 11 Jan 2013 21:15:26 +0000
(13:15 -0800)
committer
Tom Clegg <tom@clinicalfuture.com>
Fri, 11 Jan 2013 21:15:26 +0000
(13:15 -0800)
Gemfile
patch
|
blob
|
history
Gemfile.lock
patch
|
blob
|
history
diff --git
a/Gemfile
b/Gemfile
index fdd8f36e7ae0e89eca18ad900a69df1a7acda2a6..6a2cd9c64697238d8da1a11b0a66cf3c96649963 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-13,7
+13,7
@@
gem 'json'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '
~>
3.1.5'
+ gem 'sass-rails', '
=
3.1.5'
gem 'coffee-rails', '~> 3.1.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
diff --git
a/Gemfile.lock
b/Gemfile.lock
index b90def40d611b4857412fbcaaf6a4cd85e9ef8ad..dbe4c73695d03c98719c26ffe8e235ae85b679a5 100644
(file)
--- a/
Gemfile.lock
+++ b/
Gemfile.lock
@@
-31,7
+31,7
@@
GEM
multi_json (>= 1.0, < 1.3)
arel (2.2.3)
builder (3.0.4)
- capistrano (2.1
3.5
)
+ capistrano (2.1
4.1
)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@
-54,7
+54,7
@@
GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
- libv8 (3.11.8.1
1
)
+ libv8 (3.11.8.1
3
)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@
-65,7
+65,7
@@
GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.6.
2
)
+ net-ssh (2.6.
3
)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
pg (0.14.1)
@@
-110,8
+110,8
@@
GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.11.
1
)
- libv8 (~> 3.11.8.
7
)
+ therubyracer (0.11.
2
)
+ libv8 (~> 3.11.8.
12
)
ref
thor (0.14.6)
tilt (1.3.3)