Skip to content

Commit f4895ad

Browse files
committed
Updated Rails to the current HEAD (4.1.0beta)
1 parent 1b5f8b6 commit f4895ad

File tree

3 files changed

+76
-55
lines changed

3 files changed

+76
-55
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ group :development do
4141
gem 'thin'
4242

4343
group :test do
44-
if !ENV['TRAVIS'] && RUBY_VERSION < '2.0'
44+
if !ENV['TRAVIS']
4545
gem 'pry'
4646
gem 'pry-remote'
4747
gem 'pry-stack_explorer'

Gemfile.lock

+74-53
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ GIT
1616

1717
GIT
1818
remote: git://github.com/rails/activerecord-deprecated_finders.git
19-
revision: c00788c2b7e01170f63bd9651f7efd8deb4bd4b0
19+
revision: f6ed71d62d47f0f6397b5b3e801271567f30f960
2020
specs:
21-
activerecord-deprecated_finders (0.0.3)
21+
activerecord-deprecated_finders (1.0.3)
2222

2323
GIT
2424
remote: git://github.com/rails/arel.git
25-
revision: 933ea218116645eafaf3b7ea5695520db0f9d9ba
25+
revision: a1b72178714fbf0033fe076b7e51f57eff152bdd
2626
specs:
27-
arel (4.0.0.beta2.20130314230643)
27+
arel (4.0.0.20130418133826)
2828

2929
GIT
3030
remote: git://github.com/rails/coffee-rails.git
@@ -42,45 +42,49 @@ GIT
4242

4343
GIT
4444
remote: git://github.com/rails/rails.git
45-
revision: 70d0537d5550958d7e006787de869ce9046101fc
45+
revision: 16caf63d32e0a643b7fd5bea2085804f4ec74c8d
4646
specs:
47-
actionmailer (4.0.0.beta1)
48-
actionpack (= 4.0.0.beta1)
49-
mail (~> 2.5.3)
50-
actionpack (4.0.0.beta1)
51-
activesupport (= 4.0.0.beta1)
52-
builder (~> 3.1.0)
53-
erubis (~> 2.7.0)
47+
actionmailer (4.1.0.beta)
48+
actionpack (= 4.1.0.beta)
49+
mail (~> 2.5.4)
50+
actionpack (4.1.0.beta)
51+
actionview (= 4.1.0.beta)
52+
activesupport (= 4.1.0.beta)
5453
rack (~> 1.5.2)
5554
rack-test (~> 0.6.2)
56-
activemodel (4.0.0.beta1)
57-
activesupport (= 4.0.0.beta1)
55+
actionview (4.1.0.beta)
56+
activemodel (= 4.1.0.beta)
57+
activesupport (= 4.1.0.beta)
5858
builder (~> 3.1.0)
59-
activerecord (4.0.0.beta1)
60-
activemodel (= 4.0.0.beta1)
61-
activerecord-deprecated_finders (~> 0.0.3)
62-
activesupport (= 4.0.0.beta1)
63-
arel (~> 4.0.0.beta2)
64-
activesupport (4.0.0.beta1)
59+
erubis (~> 2.7.0)
60+
activemodel (4.1.0.beta)
61+
activesupport (= 4.1.0.beta)
62+
builder (~> 3.1.0)
63+
activerecord (4.1.0.beta)
64+
activemodel (= 4.1.0.beta)
65+
activerecord-deprecated_finders (~> 1.0.2)
66+
activesupport (= 4.1.0.beta)
67+
arel (~> 4.0.0)
68+
activesupport (4.1.0.beta)
6569
i18n (~> 0.6, >= 0.6.4)
66-
minitest (~> 4.2)
67-
multi_json (~> 1.3)
70+
json (~> 1.7)
71+
minitest (~> 5.0)
6872
thread_safe (~> 0.1)
69-
tzinfo (~> 0.3.33)
70-
rails (4.0.0.beta1)
71-
actionmailer (= 4.0.0.beta1)
72-
actionpack (= 4.0.0.beta1)
73-
activerecord (= 4.0.0.beta1)
74-
activesupport (= 4.0.0.beta1)
73+
tzinfo (~> 0.3.37)
74+
rails (4.1.0.beta)
75+
actionmailer (= 4.1.0.beta)
76+
actionpack (= 4.1.0.beta)
77+
actionview (= 4.1.0.beta)
78+
activerecord (= 4.1.0.beta)
79+
activesupport (= 4.1.0.beta)
7580
bundler (>= 1.3.0, < 2.0)
76-
railties (= 4.0.0.beta1)
77-
sprockets-rails (~> 2.0.0.rc3)
78-
railties (4.0.0.beta1)
79-
actionpack (= 4.0.0.beta1)
80-
activesupport (= 4.0.0.beta1)
81+
railties (= 4.1.0.beta)
82+
sprockets-rails (~> 2.0.0)
83+
railties (4.1.0.beta)
84+
actionpack (= 4.1.0.beta)
85+
activesupport (= 4.1.0.beta)
8186
rake (>= 0.8.7)
82-
rdoc (~> 3.4)
83-
thor (>= 0.17.0, < 2.0)
87+
thor (>= 0.18.1, < 2.0)
8488

8589
GIT
8690
remote: git://github.com/rails/sass-rails.git
@@ -94,9 +98,9 @@ GIT
9498

9599
GIT
96100
remote: git://github.com/rails/sprockets-rails.git
97-
revision: afce1e65f7c6df4ae96522b26e755915d238ff80
101+
revision: b522561d2d83b83c99e9aa54c8079fd1241fdf49
98102
specs:
99-
sprockets-rails (2.0.0.rc3)
103+
sprockets-rails (2.0.0)
100104
actionpack (>= 3.0)
101105
activesupport (>= 3.0)
102106
sprockets (~> 2.8)
@@ -143,9 +147,9 @@ GIT
143147

144148
GIT
145149
remote: git://github.com/sstephenson/sprockets.git
146-
revision: 18fca5c20c0dfa34d8c112353b82520869f5f099
150+
revision: cb859189faf4704022cec66863bb5bc799a1aea6
147151
specs:
148-
sprockets (2.9.0)
152+
sprockets (2.10.0)
149153
hike (~> 1.2)
150154
multi_json (~> 1.0)
151155
rack (~> 1.0)
@@ -164,7 +168,7 @@ GEM
164168
specs:
165169
addressable (2.3.3)
166170
artii (2.0.3)
167-
atomic (1.0.1)
171+
atomic (1.1.9)
168172
better_errors (0.7.2)
169173
coderay (>= 1.0.0)
170174
erubis (>= 2.6.6)
@@ -198,6 +202,7 @@ GEM
198202
execjs
199203
coffee-script-source (1.6.2)
200204
colorize (0.5.8)
205+
columnize (0.3.6)
201206
coveralls (0.6.3)
202207
colorize
203208
multi_json (~> 1.3)
@@ -207,6 +212,12 @@ GEM
207212
daemons (1.1.9)
208213
database_cleaner (0.9.1)
209214
debug_inspector (0.0.2)
215+
debugger (1.6.0)
216+
columnize (>= 0.3.1)
217+
debugger-linecache (~> 1.2.0)
218+
debugger-ruby_core_source (~> 1.2.1)
219+
debugger-linecache (1.2.0)
220+
debugger-ruby_core_source (1.2.2)
210221
diff-lcs (1.2.1)
211222
em-websocket (0.5.0)
212223
eventmachine (>= 0.12.9)
@@ -234,14 +245,14 @@ GEM
234245
multi_json (~> 1.0)
235246
hashie (1.2.0)
236247
highline (1.6.16)
237-
hike (1.2.1)
248+
hike (1.2.3)
238249
http_parser.rb (0.5.3)
239250
httpauth (0.2.0)
240251
i18n (0.6.4)
241252
jquery-rails (2.2.1)
242253
railties (>= 3.0, < 5.0)
243254
thor (>= 0.14, < 2.0)
244-
json (1.7.7)
255+
json (1.8.0)
245256
jwt (0.1.8)
246257
multi_json (>= 1.5)
247258
kgio (2.8.0)
@@ -250,18 +261,17 @@ GEM
250261
libv8 (3.11.8.13)
251262
listen (0.7.3)
252263
lumberjack (1.0.3)
253-
mail (2.5.3)
254-
i18n (>= 0.4.0)
264+
mail (2.5.4)
255265
mime-types (~> 1.16)
256266
treetop (~> 1.4.8)
257267
meta_request (0.2.2)
258268
rack-contrib
259269
railties
260270
method_source (0.8.1)
261-
mime-types (1.21)
271+
mime-types (1.23)
262272
mini_portile (0.5.0)
263-
minitest (4.7.0)
264-
multi_json (1.7.1)
273+
minitest (5.0.5)
274+
multi_json (1.7.7)
265275
multipart-post (1.2.0)
266276
mysql2 (0.3.11)
267277
net-scp (1.1.0)
@@ -301,6 +311,15 @@ GEM
301311
coderay (~> 1.0.5)
302312
method_source (~> 0.8)
303313
slop (~> 3.4)
314+
pry-debugger (0.2.2)
315+
debugger (~> 1.3)
316+
pry (~> 0.9.10)
317+
pry-remote (0.1.7)
318+
pry (~> 0.9)
319+
slop (~> 3.0)
320+
pry-stack_explorer (0.4.9)
321+
binding_of_caller (>= 0.7)
322+
pry (~> 0.9.11)
304323
rack (1.5.2)
305324
rack-contrib (1.1.0)
306325
rack (>= 0.9.1)
@@ -311,10 +330,8 @@ GEM
311330
rails_config (0.3.2)
312331
activesupport (>= 3.0)
313332
raindrops (0.10.0)
314-
rake (10.0.3)
333+
rake (10.1.0)
315334
rb-fsevent (0.9.3)
316-
rdoc (3.12.2)
317-
json (~> 1.4)
318335
ref (1.0.4)
319336
rest-client (1.6.7)
320337
mime-types (>= 1.16)
@@ -339,11 +356,11 @@ GEM
339356
daemons (>= 1.0.9)
340357
eventmachine (>= 0.12.6)
341358
rack (>= 1.0.0)
342-
thor (0.17.0)
359+
thor (0.18.1)
343360
thread_safe (0.1.0)
344361
atomic
345-
tilt (1.3.6)
346-
treetop (1.4.12)
362+
tilt (1.4.1)
363+
treetop (1.4.14)
347364
polyglot
348365
polyglot (>= 0.3.1)
349366
triglav-client (0.0.6)
@@ -392,6 +409,10 @@ DEPENDENCIES
392409
octokit
393410
omniauth
394411
omniauth-github
412+
pry
413+
pry-debugger
414+
pry-remote
415+
pry-stack_explorer
395416
rack-livereload
396417
rails!
397418
rails_config

app/contexts/host_context.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def update (params)
2222
end
2323

2424
if @host.update(params)
25-
diff = @host.previous_changes.select{ |k, v| k !~ /_at$/ }
25+
diff = @host.previous_changes.select{ |k, v| k !~ /_at$/ } || {}
2626

2727
new_relations = @host.host_relations.reload.inject([]) do |result, item|
2828
result.push('service' => item.service.name, 'role' => item.role.name)

0 commit comments

Comments
 (0)