Download as
Browse Code »

Commit 444bfaf4caa1d6076ed82eff68322ae9811eae03

Authored by Cyril Mougel
1 parent f2da6ac6
Exists in master and in 1 other branch production

Update some gem version to latest 

We need to be up to date with our dependencies. Now it's almost done
Showing 4 changed files with 38 additions and 32 deletions   Show diff stats
Gemfile
  Diff comments   View file @444bfaf
... ... @@ -5,15 +5,16 @@ gem 'mongoid', '~> 2.7.1'
5 5 gem 'mongoid_rails_migrations'
6 6 gem 'devise', '~> 1.5.4'
7 7 gem 'haml'
8   -gem 'htmlentities', "~> 4.3.0"
  8 +gem 'htmlentities'
9 9 gem 'rack-ssl', :require => 'rack/ssl' # force SSL
10 10  
11   -gem 'useragent', '~> 0.4.16'
  11 +gem 'useragent'
12 12 gem 'inherited_resources'
13 13 gem 'SystemTimer', :platform => :ruby_18
14 14 gem 'actionmailer_inline_css', "~> 1.3.0"
15 15 gem 'kaminari', '>= 0.14.1'
16 16 gem 'rack-ssl-enforcer'
  17 +# fabrication 1.3.0 is last supporting ruby 1.8. Update when stop supporting this version too
17 18 gem 'fabrication', "~> 1.3.0" # Used for both tests and demo data
18 19 gem 'rails_autolink', '~> 1.0.9'
19 20 # Please don't update hoptoad_notifier to airbrake.
... ... @@ -44,8 +45,8 @@ gem 'bitbucket_rest_api'
44 45  
45 46 # Notification services
46 47 # ---------------------------------------
47   -# Campfire
48   -gem 'campy'
  48 +# Campfire ( We can't upgrade to 1.0 because drop support of ruby 1.8
  49 +gem 'campy', '0.1.3'
49 50 # Hipchat
50 51 gem 'hipchat'
51 52 # Google Talk
... ...
Gemfile.lock
  Diff comments   View file @444bfaf
... ... @@ -125,14 +125,15 @@ GEM
125 125 foreman (0.63.0)
126 126 dotenv (>= 0.7)
127 127 thor (>= 0.13.6)
128   - haml (3.1.7)
  128 + haml (4.0.3)
  129 + tilt
129 130 happymapper (0.4.0)
130 131 libxml-ruby (~> 2.0)
131 132 has_scope (0.5.1)
132 133 hashie (1.2.0)
133 134 highline (1.6.19)
134 135 hike (1.2.2)
135   - hipchat (0.4.1)
  136 + hipchat (0.9.0)
136 137 httparty
137 138 hoi (0.0.6)
138 139 httparty (> 0.6.0)
... ... @@ -141,22 +142,22 @@ GEM
141 142 activesupport
142 143 builder
143 144 htmlentities (4.3.1)
144   - httparty (0.10.0)
  145 + httparty (0.11.0)
145 146 multi_json (~> 1.0)
146   - multi_xml
147   - httpauth (0.1)
  147 + multi_xml (>= 0.5.2)
  148 + httpauth (0.2.0)
148 149 i18n (0.6.1)
149   - inherited_resources (1.3.1)
  150 + inherited_resources (1.4.0)
150 151 has_scope (~> 0.5.0)
151   - responders (~> 0.6)
  152 + responders (~> 0.9)
152 153 journey (1.0.4)
153 154 json (1.8.0)
154   - jwt (0.1.5)
155   - multi_json (>= 1.0)
  155 + jwt (0.1.8)
  156 + multi_json (>= 1.5)
156 157 kaminari (0.14.1)
157 158 actionpack (>= 3.0.0)
158 159 activesupport (>= 3.0.0)
159   - kgio (2.7.4)
  160 + kgio (2.8.0)
160 161 launchy (2.3.0)
161 162 addressable (~> 2.3)
162 163 libv8 (3.11.8.17)
... ... @@ -201,13 +202,13 @@ GEM
201 202 nokogiri (1.5.9)
202 203 nokogiri-happymapper (0.5.7)
203 204 nokogiri (~> 1.5)
204   - oauth2 (0.8.0)
  205 + oauth2 (0.8.1)
205 206 faraday (~> 0.8)
206 207 httpauth (~> 0.1)
207 208 jwt (~> 0.1.4)
208 209 multi_json (~> 1.0)
209 210 rack (~> 1.2)
210   - octokit (1.0.7)
  211 + octokit (1.18.0)
211 212 addressable (~> 2.2)
212 213 faraday (~> 0.8)
213 214 faraday_middleware (~> 0.8)
... ... @@ -216,7 +217,7 @@ GEM
216 217 omniauth (1.1.4)
217 218 hashie (>= 1.2, < 3)
218 219 rack
219   - omniauth-github (1.0.2)
  220 + omniauth-github (1.1.0)
220 221 omniauth (~> 1.0)
221 222 omniauth-oauth2 (~> 1.1)
222 223 omniauth-oauth2 (1.1.1)
... ... @@ -261,8 +262,8 @@ GEM
261 262 activesupport (= 3.2.13)
262 263 bundler (~> 1.0)
263 264 railties (= 3.2.13)
264   - rails_autolink (1.0.9)
265   - rails (~> 3.1)
  265 + rails_autolink (1.1.0)
  266 + rails (> 3.1)
266 267 railties (3.2.13)
267 268 actionpack (= 3.2.13)
268 269 activesupport (= 3.2.13)
... ... @@ -270,13 +271,13 @@ GEM
270 271 rake (>= 0.8.7)
271 272 rdoc (~> 3.4)
272 273 thor (>= 0.14.6, < 2.0)
273   - raindrops (0.10.0)
  274 + raindrops (0.11.0)
274 275 rake (10.0.4)
275 276 rbx-require-relative (0.0.9)
276 277 rdoc (3.12.2)
277 278 json (~> 1.4)
278 279 ref (1.0.4)
279   - responders (0.9.2)
  280 + responders (0.9.3)
280 281 railties (~> 3.1)
281 282 rest-client (1.6.7)
282 283 mime-types (>= 1.16)
... ... @@ -340,11 +341,11 @@ GEM
340 341 execjs (>= 0.3.0)
341 342 multi_json (~> 1.0, >= 1.0.2)
342 343 underscore-rails (1.4.2.1)
343   - unicorn (4.3.1)
  344 + unicorn (4.6.2)
344 345 kgio (~> 2.6)
345 346 rack
346 347 raindrops (~> 0.7)
347   - useragent (0.4.16)
  348 + useragent (0.6.0)
348 349 warden (1.2.1)
349 350 rack (>= 1.0)
350 351 webmock (1.11.0)
... ... @@ -367,7 +368,7 @@ DEPENDENCIES
367 368 bitbucket_rest_api
368 369 bson
369 370 bson_ext
370   - campy
  371 + campy (= 0.1.3)
371 372 capistrano
372 373 capybara
373 374 coveralls
... ... @@ -383,7 +384,7 @@ DEPENDENCIES
383 384 hipchat
384 385 hoi
385 386 hoptoad_notifier (~> 2.4)
386   - htmlentities (~> 4.3.0)
  387 + htmlentities
387 388 httparty
388 389 inherited_resources
389 390 kaminari (>= 0.14.1)
... ... @@ -393,7 +394,7 @@ DEPENDENCIES
393 394 mongo
394 395 mongoid (~> 2.7.1)
395 396 mongoid_rails_migrations
396   - octokit (~> 1.0.0)
  397 + octokit
397 398 omniauth-github
398 399 oruen_redmine_client
399 400 pivotal-tracker
... ... @@ -401,7 +402,7 @@ DEPENDENCIES
401 402 rack-ssl
402 403 rack-ssl-enforcer
403 404 rails (= 3.2.13)
404   - rails_autolink (~> 1.0.9)
  405 + rails_autolink
405 406 ri_cal
406 407 rspec-rails (~> 2.6)
407 408 ruby-debug
... ... @@ -414,7 +415,7 @@ DEPENDENCIES
414 415 uglifier (>= 1.0.3)
415 416 underscore-rails
416 417 unicorn
417   - useragent (~> 0.4.16)
  418 + useragent
418 419 webmock
419 420 xmpp4r
420 421 yajl-ruby
... ...
spec/models/notice_spec.rb
  Diff comments   View file @444bfaf
... ... @@ -37,7 +37,9 @@ describe Notice do
37 37  
38 38 describe "user agent" do
39 39 it "should be parsed and human-readable" do
40   - notice = Fabricate.build(:notice, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
  40 + notice = Fabricate.build(:notice, :request => {'cgi-data' => {
  41 + 'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'
  42 + }})
41 43 notice.user_agent.browser.should == 'Chrome'
42 44 notice.user_agent.version.to_s.should =~ /^10\.0/
43 45 end
... ... @@ -51,7 +53,7 @@ describe Notice do
51 53 describe "user agent string" do
52 54 it "should be parsed and human-readable" do
53 55 notice = Fabricate.build(:notice, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
54   - notice.user_agent_string.should == 'Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)'
  56 + notice.user_agent_string.should == 'Chrome 10.0.648.204 (OS X 10.6.7)'
55 57 end
56 58  
57 59 it "should be nil if HTTP_USER_AGENT is blank" do
... ...
spec/models/problem_spec.rb
  Diff comments   View file @444bfaf
... ... @@ -334,7 +334,7 @@ describe Problem do
334 334 it "adding a notice adds a string to #user_agents" do
335 335 lambda {
336 336 Fabricate(:notice, :err => @err, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
337   - }.should change(@problem, :user_agents).from({}).to({Digest::MD5.hexdigest('Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)') => {'value' => 'Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)', 'count' => 1}})
  337 + }.should change(@problem, :user_agents).from({}).to({Digest::MD5.hexdigest('Chrome 10.0.648.204 (OS X 10.6.7)') => {'value' => 'Chrome 10.0.648.204 (OS X 10.6.7)', 'count' => 1}})
338 338 end
339 339  
340 340 it "removing a notice removes string from #user_agents" do
... ... @@ -342,7 +342,9 @@ describe Problem do
342 342 lambda {
343 343 @err.notices.first.destroy
344 344 @problem.reload
345   - }.should change(@problem, :user_agents).from({Digest::MD5.hexdigest('Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)') => {'value' => 'Chrome 10.0.648.204 (Intel Mac OS X 10_6_7)', 'count' => 1}}).to({})
  345 + }.should change(@problem, :user_agents).from({
  346 + Digest::MD5.hexdigest('Chrome 10.0.648.204 (OS X 10.6.7)') => {'value' => 'Chrome 10.0.648.204 (OS X 10.6.7)', 'count' => 1}
  347 + }).to({})
346 348 end
347 349 end
348 350  
... ...