Commit 440cd375380393023c1112c5a3bb47c70302387b

Authored by Thomas Cioppettini
1 parent 93cf2659
Exists in master and in 1 other branch production

Update from upstream master.

Showing 1 changed file with 4 additions and 7 deletions   Show diff stats
@@ -86,7 +86,6 @@ The list of requirements to install Errbit are : @@ -86,7 +86,6 @@ The list of requirements to install Errbit are :
86 * MongoDB 2.2.0 or higher 86 * MongoDB 2.2.0 or higher
87 87
88 Errbit uses Ruby 2.0.0 as a default. However, it is compatible with Ruby 1.9.3 and above. 88 Errbit uses Ruby 2.0.0 as a default. However, it is compatible with Ruby 1.9.3 and above.
89 -To use a different version of ruby, override the `RUBY_VERSION` constant with the version you are using.  
90 89
91 Installation 90 Installation
92 ------------ 91 ------------
@@ -372,7 +371,7 @@ This gives you the ability to ask the user for more information, @@ -372,7 +371,7 @@ This gives you the ability to ask the user for more information,
372 and let them know when you've fixed the bug. 371 and let them know when you've fixed the bug.
373 372
374 If you are running a Rails application and would like to include information 373 If you are running a Rails application and would like to include information
375 -about the current user in your error reports, you can replace the `airbrake` 374 +about the current user in your error reports, you can replace the `airbrake`
376 gem in your Gemfile with `airbrake_user_attributes`. 375 gem in your Gemfile with `airbrake_user_attributes`.
377 This gem is a wrapper around the `airbrake` gem and will automatically 376 This gem is a wrapper around the `airbrake` gem and will automatically
378 inject information about the user into any error reports, 377 inject information about the user into any error reports,
@@ -394,7 +393,7 @@ You can log javascript errors that occur in your application by following the di @@ -394,7 +393,7 @@ You can log javascript errors that occur in your application by following the di
394 393
395 # Rails Applications 394 # Rails Applications
396 395
397 -Add the following line to the `<head>` section of your application template. 396 +Add the following line to the `<head>` section of your application template.
398 397
399 ``` 398 ```
400 <%= airbrake_javascript_notifier %> 399 <%= airbrake_javascript_notifier %>
@@ -402,7 +401,6 @@ Add the following line to the `&lt;head&gt;` section of your application template. @@ -402,7 +401,6 @@ Add the following line to the `&lt;head&gt;` section of your application template.
402 401
403 # Other Platforms 402 # Other Platforms
404 403
405 -  
406 include the following before any javascript is loaded in your application. 404 include the following before any javascript is loaded in your application.
407 405
408 ``` 406 ```
@@ -413,7 +411,7 @@ include the following before any javascript is loaded in your application. @@ -413,7 +411,7 @@ include the following before any javascript is loaded in your application.
413 Using custom fingerprinting methods 411 Using custom fingerprinting methods
414 ----------------------------------- 412 -----------------------------------
415 413
416 -Errbit allows you to use your own Fingerprinting Strategy. 414 +Errbit allows you to use your own Fingerprinting Strategy.
417 If you are upgrading from a very old version of errbit, you can use the `LegacyFingerprint` for compatibility. The fingerprint strategy can be changed by adding an initializer to errbit: 415 If you are upgrading from a very old version of errbit, you can use the `LegacyFingerprint` for compatibility. The fingerprint strategy can be changed by adding an initializer to errbit:
418 416
419 ```ruby 417 ```ruby
@@ -599,7 +597,6 @@ and make **optional** features configurable via `config/config.yml`. @@ -599,7 +597,6 @@ and make **optional** features configurable via `config/config.yml`.
599 * Commit, do not mess with Rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself we can ignore when we pull) 597 * Commit, do not mess with Rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself we can ignore when we pull)
600 * Send us a pull request. Bonus points for topic branches. 598 * Send us a pull request. Bonus points for topic branches.
601 * Add you on the CONTRIBUTORS.md file on the current release 599 * Add you on the CONTRIBUTORS.md file on the current release
602 -*  
603 600
604 # Running tests 601 # Running tests
605 602
@@ -609,5 +606,5 @@ More information can be found in the [**Errbit Advanced Developer Guide**](docs @@ -609,5 +606,5 @@ More information can be found in the [**Errbit Advanced Developer Guide**](docs
609 Copyright 606 Copyright
610 --------- 607 ---------
611 608
612 -Copyright (c) 2010-2013 Errbit Team. See LICENSE for details. 609 +Copyright (c) 2010-2014 Errbit Team. See LICENSE for details.
613 610