Skip to content

Commit b757826

Browse files
author
Tony Guntharp
committed
Merge pull request #230 from gabceb/kandan-229
Updated gems
2 parents 60d6f53 + 4aee581 commit b757826

File tree

2 files changed

+49
-50
lines changed

2 files changed

+49
-50
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
# Core gems
4-
gem 'rails', '3.2.12'
4+
gem 'rails', '3.2.13'
55

66
# Database adapters
77
gem 'pg'

Gemfile.lock

+48-49
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.12)
5-
actionpack (= 3.2.12)
6-
mail (~> 2.4.4)
7-
actionpack (3.2.12)
8-
activemodel (= 3.2.12)
9-
activesupport (= 3.2.12)
4+
actionmailer (3.2.13)
5+
actionpack (= 3.2.13)
6+
mail (~> 2.5.3)
7+
actionpack (3.2.13)
8+
activemodel (= 3.2.13)
9+
activesupport (= 3.2.13)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
1313
rack (~> 1.4.5)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.2.1)
17-
activemodel (3.2.12)
18-
activesupport (= 3.2.12)
17+
activemodel (3.2.13)
18+
activesupport (= 3.2.13)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.12)
21-
activemodel (= 3.2.12)
22-
activesupport (= 3.2.12)
20+
activerecord (3.2.13)
21+
activemodel (= 3.2.13)
22+
activesupport (= 3.2.13)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.12)
26-
activemodel (= 3.2.12)
27-
activesupport (= 3.2.12)
28-
activesupport (3.2.12)
29-
i18n (~> 0.6)
25+
activeresource (3.2.13)
26+
activemodel (= 3.2.13)
27+
activesupport (= 3.2.13)
28+
activesupport (3.2.13)
29+
i18n (= 0.6.1)
3030
multi_json (~> 1.0)
3131
addressable (2.3.3)
3232
arel (3.0.2)
3333
awesome_print (1.1.0)
34-
aws-sdk (1.8.4)
34+
aws-sdk (1.8.5)
3535
json (~> 1.4)
3636
nokogiri (>= 1.4.4)
3737
uuidtools (~> 2.1)
@@ -46,8 +46,8 @@ GEM
4646
bourbon (3.1.1)
4747
sass (>= 3.2.0)
4848
thor
49-
bourne (1.1.2)
50-
mocha (= 0.10.5)
49+
bourne (1.2.1)
50+
mocha (= 0.12.7)
5151
builder (3.0.4)
5252
capybara (2.0.2)
5353
mime-types (>= 1.16)
@@ -82,12 +82,11 @@ GEM
8282
daemons (1.1.9)
8383
database_cleaner (0.9.1)
8484
debug_inspector (0.0.2)
85-
debugger (1.4.0)
85+
debugger (1.5.0)
8686
columnize (>= 0.3.1)
87-
debugger-linecache (~> 1.1.1)
87+
debugger-linecache (~> 1.2.0)
8888
debugger-ruby_core_source (~> 1.2.0)
89-
debugger-linecache (1.1.2)
90-
debugger-ruby_core_source (>= 1.1.1)
89+
debugger-linecache (1.2.0)
9190
debugger-ruby_core_source (1.2.0)
9291
devise (2.2.3)
9392
bcrypt-ruby (~> 3.0)
@@ -111,7 +110,7 @@ GEM
111110
enumerize (0.5.1)
112111
activesupport (>= 3.2)
113112
erubis (2.7.0)
114-
eventmachine (1.0.1)
113+
eventmachine (1.0.3)
115114
execjs (1.4.0)
116115
multi_json (~> 1.0)
117116
factory_girl (4.2.0)
@@ -138,12 +137,12 @@ GEM
138137
pry (>= 0.9.10)
139138
terminal-table (>= 1.4.3)
140139
thor (>= 0.14.6)
141-
guard-rspec (2.5.0)
140+
guard-rspec (2.5.1)
142141
guard (>= 1.1)
143142
rspec (~> 2.11)
144143
hike (1.2.1)
145144
http_parser.rb (0.5.3)
146-
i18n (0.6.4)
145+
i18n (0.6.1)
147146
jasmine (1.3.2)
148147
jasmine-core (~> 1.3.1)
149148
rack (~> 1.0)
@@ -164,17 +163,17 @@ GEM
164163
addressable (~> 2.3)
165164
listen (0.7.3)
166165
lumberjack (1.0.2)
167-
mail (2.4.4)
166+
mail (2.5.3)
168167
i18n (>= 0.4.0)
169168
mime-types (~> 1.16)
170169
treetop (~> 1.4.8)
171170
metaclass (0.0.1)
172171
method_source (0.8.1)
173172
mime-types (1.21)
174-
mocha (0.10.5)
173+
mocha (0.12.7)
175174
metaclass (~> 0.0.1)
176-
multi_json (1.6.1)
177-
nokogiri (1.5.6)
175+
multi_json (1.7.1)
176+
nokogiri (1.5.7)
178177
orm_adapter (0.4.0)
179178
paperclip (3.4.1)
180179
activemodel (>= 3.0.0)
@@ -203,17 +202,17 @@ GEM
203202
rack
204203
rack-test (0.6.2)
205204
rack (>= 1.0)
206-
rails (3.2.12)
207-
actionmailer (= 3.2.12)
208-
actionpack (= 3.2.12)
209-
activerecord (= 3.2.12)
210-
activeresource (= 3.2.12)
211-
activesupport (= 3.2.12)
205+
rails (3.2.13)
206+
actionmailer (= 3.2.13)
207+
actionpack (= 3.2.13)
208+
activerecord (= 3.2.13)
209+
activeresource (= 3.2.13)
210+
activesupport (= 3.2.13)
212211
bundler (~> 1.0)
213-
railties (= 3.2.12)
214-
railties (3.2.12)
215-
actionpack (= 3.2.12)
216-
activesupport (= 3.2.12)
212+
railties (= 3.2.13)
213+
railties (3.2.13)
214+
actionpack (= 3.2.13)
215+
activesupport (= 3.2.13)
217216
rack-ssl (~> 1.3.2)
218217
rake (>= 0.8.7)
219218
rdoc (~> 3.4)
@@ -228,7 +227,7 @@ GEM
228227
rspec-core (~> 2.13.0)
229228
rspec-expectations (~> 2.13.0)
230229
rspec-mocks (~> 2.13.0)
231-
rspec-core (2.13.0)
230+
rspec-core (2.13.1)
232231
rspec-expectations (2.13.0)
233232
diff-lcs (>= 1.1.3, < 2.0)
234233
rspec-mocks (2.13.0)
@@ -240,7 +239,7 @@ GEM
240239
rspec-expectations (~> 2.13.0)
241240
rspec-mocks (~> 2.13.0)
242241
rubyzip (0.9.9)
243-
sass (3.2.6)
242+
sass (3.2.7)
244243
sass-rails (3.2.6)
245244
railties (~> 3.2.0)
246245
sass (>= 3.1.10)
@@ -250,31 +249,31 @@ GEM
250249
multi_json (~> 1.0)
251250
rubyzip
252251
websocket (~> 1.0.4)
253-
shoulda-matchers (1.4.2)
252+
shoulda-matchers (1.5.0)
254253
activesupport (>= 3.0.0)
255-
bourne (~> 1.1.2)
254+
bourne (~> 1.2.0)
256255
simplecov (0.7.1)
257256
multi_json (~> 1.0)
258257
simplecov-html (~> 0.7.1)
259258
simplecov-html (0.7.1)
260-
slop (3.4.3)
259+
slop (3.4.4)
261260
sprockets (2.2.2)
262261
hike (~> 1.2)
263262
multi_json (~> 1.0)
264263
rack (~> 1.0)
265264
tilt (~> 1.1, != 1.3.0)
266265
sqlite3 (1.3.7)
267266
terminal-table (1.4.5)
268-
thin (1.5.0)
267+
thin (1.5.1)
269268
daemons (>= 1.0.9)
270269
eventmachine (>= 0.12.6)
271270
rack (>= 1.0.0)
272271
thor (0.17.0)
273-
tilt (1.3.4)
272+
tilt (1.3.6)
274273
treetop (1.4.12)
275274
polyglot
276275
polyglot (>= 0.3.1)
277-
tzinfo (0.3.36)
276+
tzinfo (0.3.37)
278277
uglifier (1.3.0)
279278
execjs (>= 0.3.0)
280279
multi_json (~> 1.0, >= 1.0.2)
@@ -322,7 +321,7 @@ DEPENDENCIES
322321
poltergeist
323322
pry-rails
324323
quiet_assets
325-
rails (= 3.2.12)
324+
rails (= 3.2.13)
326325
remotipart
327326
rspec-rails
328327
sass-rails

0 commit comments

Comments
 (0)