Merge remote-tracking branch 'updates/master' into github

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/errbit.js
	app/assets/stylesheets/errbit.css
	app/models/user.rb
	config/initializers/_load_config.rb

Gemfile

@@ -3,27 +3,33 @@ source 'http://rubygems.org'
 gem 'rails', '~> 3.2.0'
 
 gem 'nokogiri'
-gem 'mongoid', '~> 2.2.2'
+gem 'mongoid', '~> 2.4.10'
 
 gem 'haml'
 gem 'htmlentities', "~> 4.3.0"
-gem 'devise', '~> 1.4.0'
+
+gem 'devise', '~> 1.5.3'
+
 gem 'omniauth-github'
 gem 'oa-core'
+
 gem 'lighthouse-api'
 gem 'oruen_redmine_client', :require => 'redmine_client'
 gem 'mongoid_rails_migrations'
 gem 'useragent', '~> 0.3.1'
 gem 'pivotal-tracker'
 gem 'ruby-fogbugz', :require => 'fogbugz'
-gem 'octokit'
+
+gem 'octokit', '~> 1.0.0'
+
 gem 'inherited_resources'
 gem 'SystemTimer', :platform => :ruby_18
 gem 'hoptoad_notifier', "~> 2.4"
 gem 'actionmailer_inline_css', "~> 1.3.0"
 gem 'kaminari'
 gem 'rack-ssl-enforcer'
 gem 'fabrication', "~> 1.3.0"   # Both for tests, and loading demo data
+gem 'rails_autolink', '~> 1.0.9'
 
 platform :ruby do
   gem 'mongo', '= 1.3.1'
@@ -32,13 +38,14 @@ platform :ruby do
 end
 
 gem 'ri_cal'
+gem 'yajl-ruby'
 
 group :development, :test do
   gem 'rspec-rails', '~> 2.6'
   gem 'webmock', :require => false
-  unless ENV['TRAVIS']
+  unless ENV["CI"]
     gem 'ruby-debug', :platform => :mri_18
-    # gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
+    gem (RUBY_VERSION == "1.9.2" ? 'ruby-debug19' : 'debugger'), :platform => :mri_19
   end
   # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update"
 end
@@ -55,3 +62,13 @@ group :heroku do
   gem 'unicorn'
 end
 
+# Use thin for development
+gem 'thin', :group => :development, :platform => :ruby
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'execjs'
+  gem 'therubyracer', :platform => :ruby  # C Ruby (MRI) or Rubinius, but NOT Windows
+  gem 'uglifier',     '>= 1.0.3'
+end

Gemfile.lock

@@ -53,16 +53,27 @@ GEM
     css_parser (1.2.6)
       addressable
       rdoc
+    daemons (1.1.8)
     database_cleaner (0.6.7)
-    devise (1.4.9)
+    debugger (1.1.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.2)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.2)
+    devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
+      warden (~> 1.1)
     diff-lcs (1.1.3)
     email_spec (1.2.1)
       mail (~> 2.2)
       rspec (~> 2.0)
     erubis (2.7.0)
+    eventmachine (0.12.10)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
     fabrication (1.3.2)
     faraday (0.7.6)
       addressable (~> 2.2)
@@ -86,14 +97,15 @@ GEM
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     journey (1.0.3)
-    json (1.7.1)
+    json (1.7.3)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     kgio (2.7.4)
     launchy (2.1.0)
       addressable (~> 2.2.6)
+    libv8 (3.3.10.4)
     libwebsocket (0.1.3)
       addressable
     libxml-ruby (2.3.2)
@@ -109,18 +121,18 @@ GEM
     mime-types (1.18)
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.2.5)
-      activemodel (~> 3.0)
+    mongoid (2.4.10)
+      activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     mongoid_rails_migrations (0.0.14)
       activesupport (>= 3.0.0)
       bundler (>= 1.0.0)
       rails (>= 3.0.0)
       railties (>= 3.0.0)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     multipart-post (1.1.5)
-    nokogiri (1.5.2)
+    nokogiri (1.5.0)
     oa-core (0.3.2)
     oauth2 (0.5.2)
       faraday (~> 0.7)
@@ -172,6 +184,8 @@ GEM
       activesupport (= 3.2.3)
       bundler (~> 1.0)
       railties (= 3.2.3)
+    rails_autolink (1.0.9)
+      rails (~> 3.1)
     railties (3.2.3)
       actionpack (= 3.2.3)
       activesupport (= 3.2.3)
@@ -220,24 +234,34 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.10.1)
+      libv8 (~> 3.3.10)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
+    uglifier (1.2.4)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
     useragent (0.3.2)
-    warden (1.0.6)
+    warden (1.2.0)
       rack (>= 1.0)
     webmock (1.8.6)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     xpath (0.1.4)
       nokogiri (~> 1.3)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -249,8 +273,10 @@ DEPENDENCIES
   bson_ext (= 1.3.1)
   capybara
   database_cleaner (~> 0.6.0)
-  devise (~> 1.4.0)
+  debugger
+  devise (~> 1.5.3)
   email_spec
+  execjs
   fabrication (~> 1.3.0)
   haml
   hoptoad_notifier (~> 2.4)
@@ -260,21 +286,26 @@ DEPENDENCIES
   launchy
   lighthouse-api
   mongo (= 1.3.1)
-  mongoid (~> 2.2.2)
+  mongoid (~> 2.4.10)
   mongoid_rails_migrations
   nokogiri
   oa-core
-  octokit
+  octokit (~> 1.0.0)
   omniauth-github
   oruen_redmine_client
   pivotal-tracker
   rack-ssl-enforcer
   rails (~> 3.2.0)
+  rails_autolink (~> 1.0.9)
   ri_cal
   rspec (~> 2.6)
   rspec-rails (~> 2.6)
   ruby-debug
   ruby-fogbugz
+  therubyracer
+  thin
+  uglifier (>= 1.0.3)
   unicorn
   useragent (~> 0.3.1)
   webmock
+  yajl-ruby

README.md

@@ -1,11 +1,49 @@
-Errbit [![TravisCI](http://travis-ci.org/errbit/errbit.png?branch=master)](http://travis-ci.org/errbit/errbit)
-======
+# Errbit [![TravisCI][travis-img-url]][travis-ci-url]
+
+[travis-img-url]: https://secure.travis-ci.org/errbit/errbit.png?branch=master
+[travis-ci-url]: http://travis-ci.org/errbit/errbit
+
+### The open source, self-hosted error catcher
 
-**The open source self-hosted error catcher**
 
 Errbit is a tool for collecting and managing errors from other applications.
 It is [Airbrake](http://airbrakeapp.com) (formerly known as Hoptoad) API compliant,
-so if you are already using Airbrake, you can just point hoptoad_notifier at your Errbit server.
+so if you are already using Airbrake, you can just point the `airbrake` gem to your Errbit server.
+
+
+<table>
+  <tr>
+    <td align="center">
+      <a href="http://errbit.github.com/errbit/images/apps.png" target="_blank" title="Apps">
+        <img src="http://errbit.github.com/errbit/images/apps_thumb.png" alt="Apps">
+      </a>
+      <br />
+      <em>Apps</em>
+    </td>
+    <td align="center">
+      <a href="http://errbit.github.com/errbit/images/app_errors.png" target="_blank" title="Errors">
+        <img src="http://errbit.github.com/errbit/images/app_errors_thumb.png" alt="Errors">
+      </a>
+      <br />
+      <em>Errors</em>
+    </td>
+    <td align="center">
+      <a href="http://errbit.github.com/errbit/images/error_summary.png" target="_blank" title="Error Summary">
+        <img src="http://errbit.github.com/errbit/images/error_summary_thumb.png" alt="Error Summary">
+      </a>
+      <br />
+      <em>Error Summary</em>
+    </td>
+    <td align="center">
+      <a href="http://errbit.github.com/errbit/images/error_backtrace.png" target="_blank" title="Error Backtraces">
+        <img src="http://errbit.github.com/errbit/images/error_backtrace_thumb.png" alt="Error Backtraces">
+      </a>
+      <br />
+      <em>Error Backtraces</em>
+    </td>
+  </tr>
+</table>
+
 
 Errbit may be a good fit for you if:
 
@@ -170,6 +208,29 @@ rake db:migrate
 If we change the way that data is stored, this will run any migrations to bring your database up to date.
 
 
+User information in error reports
+-----------------------------
+
+Errbit can now display information about the user who experienced an error.
+This gives you the ability to ask the user for more information,
+and let them know when you've fixed the bug.
+
+If you would like to include information about the current user in your error reports,
+you can replace the `airbrake` gem in your Gemfile with `airbrake_user_attributes`,
+which wraps the `airbrake` gem and injects user information.
+It will inject information about the current user into the error report
+if your Rails app's controller responds to a `#current_user` method.
+The user's attributes are filtered to remove authentication fields.
+
+If user information is received with an error report,
+it will be displayed under the *User Details* tab:
+
+
+![User details tab](http://errbit.github.com/errbit/images/error_user_information.png)
+
+(This tab will be hidden if no user information is available.)
+
+
 Issue Trackers
 --------------
 
@@ -200,8 +261,8 @@ Issue Trackers
 **Github Issues Integration**
 
 * For 'Account/Repository', the account will either be a username or organization. i.e. **errbit/errbit**
-* If you are logged in on [Github](https://github.com), you can find your **API Token** on this page: [https://github.com/account/admin](https://github.com/account/admin).
-* You will also need to provide the username that your API Token is connected to.
+* You will also need to provide your username and password for your Github account.
+  * (We'd really appreciate it if you wanted to help us implement OAuth instead!)
 
 
 What if Errbit has an error?

Rakefile

@@ -7,7 +7,7 @@ require 'bundler'
 
 Errbit::Application.load_tasks
 
-Rake::Task[:default].clear
+Rake::Task[:default].clear if Rake::Task.task_defined?(:default)
 
 namespace :spec do
   desc "Preparing test env"

app/assets/javascripts/application.js.erb

@@ -0,0 +1,14 @@
+//= require jquery
+//= require underscore-1.1.6
+//= require rails
+//= require form
+//= require jquery.pjax
+//= require jquery.alerts
+//= require rails.alerts
+//= require errbit
+//= require_self
+
+// Allow any gems named 'errbit_*' to require their own assets
+<% Gem.loaded_specs.keys.grep(/^errbit_/).each do |plugin|
+  require_asset(plugin) rescue Sprockets::FileNotFound
+end %>

public/javascripts/application.js → app/assets/javascripts/errbit.js

@@ -41,7 +41,7 @@ $(function() {
     $('.notice-pagination').each(function() {
       $('.notice-pagination a').pjax('#content', { timeout: 2000});
       $('#content').bind('pjax:start',  function() {
-	$('.notice-pagination-loader').css("visibility", "visible");
+  $('.notice-pagination-loader').css("visibility", "visible");
         currentTab = $('.tab-bar ul li a.button.active').attr('rel');
       });
 
@@ -73,6 +73,9 @@ $(function() {
     tab.closest('.tab-bar').find('a.active').removeClass('active');
     tab.addClass('active');
 
+    // If clicking into 'backtrace' tab, hide external backtrace
+    if (tab.attr('rel') == "backtrace") { hide_external_backtrace(); }
+
     $('.panel').hide();
     panel.show();
   }
@@ -114,5 +117,18 @@ $(function() {
 
   toggleRequiredPasswordMarks();
 
+  function hide_external_backtrace() {
+    $('tr.toggle_external_backtrace').hide();
+    $('td.backtrace_separator').show();
+  }
+  function show_external_backtrace() {
+    $('tr.toggle_external_backtrace').show();
+    $('td.backtrace_separator').hide();
+  }
+  // Show external backtrace lines when clicking separator
+  $('td.backtrace_separator span').live('click', show_external_backtrace);
+  // Hide external backtrace on page load
+  hide_external_backtrace();
+
   init();
 });

app/assets/stylesheets/application.css.erb

@@ -0,0 +1,12 @@
+/*
+ *= require reset
+ *= require jquery.alerts
+ *= require errbit
+ *= require issue_tracker_icons
+ *= require_self
+ */
+
+// Allow any gems named 'errbit_*' to require their own assets
+<% Gem.loaded_specs.keys.grep(/^errbit_/).each do |plugin|
+  require_asset(plugin) rescue Sprockets::FileNotFound
+end %>