Skip to content

Commit 7c70fdc

Browse files
committed
dummy
1 parent 9ba9e37 commit 7c70fdc

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ gem 'unicorn'
3636

3737
# Deploy with Capistrano
3838
gem 'capistrano'
39+
gem 'rvm-capistrano'
3940

4041
# To use debugger
4142
# gem 'debugger'

Gemfile.lock

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ GEM
5151
i18n (0.6.1)
5252
journey (1.0.4)
5353
jquery-rails (2.2.1)
54-
railties (>= 3.0, < 5.0)
55-
thor (>= 0.14, < 2.0)
54+
railties (< 5.0, >= 3.0)
55+
thor (< 2.0, >= 0.14)
5656
json (1.7.7)
5757
kgio (2.8.0)
5858
libv8 (3.11.8.17)
@@ -92,12 +92,14 @@ GEM
9292
rack-ssl (~> 1.3.2)
9393
rake (>= 0.8.7)
9494
rdoc (~> 3.4)
95-
thor (>= 0.14.6, < 2.0)
95+
thor (< 2.0, >= 0.14.6)
9696
raindrops (0.11.0)
9797
rake (10.0.4)
9898
rdoc (3.12.2)
9999
json (~> 1.4)
100100
ref (1.0.4)
101+
rvm-capistrano (1.3.0)
102+
capistrano (>= 2.0.0)
101103
sass (3.2.8)
102104
sass-rails (3.2.6)
103105
railties (~> 3.2.0)
@@ -107,7 +109,7 @@ GEM
107109
hike (~> 1.2)
108110
multi_json (~> 1.0)
109111
rack (~> 1.0)
110-
tilt (~> 1.1, != 1.3.0)
112+
tilt (!= 1.3.0, ~> 1.1)
111113
therubyracer (0.11.4)
112114
libv8 (~> 3.11.8.12)
113115
ref
@@ -119,7 +121,7 @@ GEM
119121
tzinfo (0.3.37)
120122
uglifier (2.0.1)
121123
execjs (>= 0.3.0)
122-
multi_json (~> 1.0, >= 1.0.2)
124+
multi_json (>= 1.0.2, ~> 1.0)
123125
unicorn (4.6.2)
124126
kgio (~> 2.6)
125127
rack
@@ -134,6 +136,7 @@ DEPENDENCIES
134136
jquery-rails
135137
mysql2
136138
rails (= 3.2.13)
139+
rvm-capistrano
137140
sass-rails (~> 3.2.3)
138141
therubyracer
139142
uglifier (>= 1.0.3)

0 commit comments

Comments
 (0)