Merge branch 'mongoid-3' into pr/289

Conflicts: app/views/apps/show.html.haml

Merge branch 'mongoid-3' into pr/289
Conflicts: app/views/apps/show.html.haml
Cyril Mougel
2 parents a0af5530 cd44ad81
Showing 228 changed files with 6164 additions and 2133 deletions Show diff stats
.gitignore
.rspec
.travis.yml
CHANGELOG.md
CONTRIBUTORS.md
Gemfile
Gemfile.lock
LICENSE
Procfile
README.md
app/assets/images/flowdock_create.png
app/assets/images/flowdock_goto.png
app/assets/images/flowdock_inactive.png
app/assets/images/hubot_create.png
app/assets/images/hubot_goto.png
app/assets/images/hubot_inactive.png
app/assets/images/jira_active.png
app/assets/images/jira_create.png
app/assets/images/jira_goto.png
app/assets/images/jira_inactive.png
@@ -13,3 +13,9 @@ config/newrelic.yml
 *~
 *.rbc
 .DS_Store
+*.rbx
+bin
+bundle
+coverage
+*#
+.ruby-version
@@ -1,4 +0,0 @@
---colour
---tty
---drb
---format documentation
 language: ruby
+env:
+  - COVERAGE=true
 rvm:
+  - 2.0.0
   - 1.9.3
-  - 1.9.2
-  - 1.8.7
+  - rbx-19mode
 services: mongodb
+#script: ./script/rspec-queue-mongoid.rb --format progress spec
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
 # To stop Travis from running tests for a new commit,
 # add the following to your commit message: [ci skip]
@@ -0,0 +1,155 @@
+## 0.3.0 - Not released Yet
+
+### Improvements
+
+- [#515][] Update to Mongoid 3.1 ([@arthurnn][])
+
+
+[#515]: https://github.com/errbit/errbit/issues/515
+
+## 0.2.1 - Not released Yet
+
+### Improvements
+
+- [#552][] Limite size of asset on errbit ([@tscolari][])
+
+### Bug Fixes
+
+- [#558][] Avoid failure if you remote bitbucket_rest_api gem
+  ([@shingara][])
+
+[@shingara]: https://github.com/shingara
+[@tscolari]: https://github.com/tscolari
+
+[#552]: https://github.com/errbit/errbit/issues/552
+[#558]: https://github.com/errbit/errbit/issues/558
+
+## 0.2.0 - 2013-09-11
+
+### Improvements
+
+- Update some gems ([@shingara][])
+- [#492][] Improve some Pjax call ([@nfedyashev][])
+- [#428][] Add the support of Unfuddle Issue Tracker ([@parallel588][])
+- Avoid to delete his own user ([@shingara][])
+- [#456][] Avoid to delete admin access of current user logged ([@shingara][])
+- [#253][] Refactor the Fingerprint generation ([@boblail][])
+- [#508][] Merge comments to when you merge problems ([@shingara][])
+- Update the Devise Gem to the last one ([@shingara][])
+- [#524][] Add current user information on the notifer.js ([@roryf][])
+- [#523][] Update javascript-stacktrace ([@aliscott][])
+- [#516][] Add Jira Issue tracker ([@xenji][])
+- [#512][] Add capabilities to configure the use of sendmail to send
+  email from Errbit ([@shingara][])
+- [#532][] Use https link in Gravatar if you use errbit on https
+  ([@jeroenj][])
+- [#536][] Order app by name by default ([@2called-chaos][])
+- [#542][] Allow the MONGODB_URL env configuration about Mongodb ([@bacongobbler][])
+- [#530][] Improve the flowdock notification ([@nfedyashev][])
+- [#531][] Improve the HipChat notification message ([@brendonrapp][])
+
+
+### Bug Fixes
+
+- [#343][] Fix the ical generation. ([@shingara][])
+- [#503][] Fix issue on where the service_url choose never use. ([@nfedyashev][])
+- [#506][] Fix issue on bitbucket issue tracker creation failed. ([@Gonzih][])
+- [#514][] Add CDATA in xml return by Javascript. ([@mildavw][])
+- [#517][] Javascript escape path from javascript Notifier. ([@roryf][])
+- [#518][] Fix issue when you try launch task errbit:db:update_update_problem_attrs. ([@shingara][])
+- [#526][] Fix issue of pagination after search. ([@shingara][])
+- [#528][] Fix issue of action after search. ([@shingara][])
+
+## 0.1.0 - 2013-05-29
+
+### Improvements
+
+- [#474][] Improve message when access denied. ([@chadcf][])
+- [#468][] Launch a repairDatabase in MongoDB database after launching
+  the clear_resolved task. ([@shingara][])
+- Update gem of Mongoid to 2.7.1
+- Update gem of Mongo to 1.8.5
+- [#457][] Add task information about db:seed in Readme. ([@mildavw][])
+- Add support of Ruby 2.0.0
+- [#475][] Return a HTTP 422 status code when you try push notice with
+  bad api key. ([@shingara][])
+- Return a 400 http status when you try put a notice without args.
+  ([@shingara][])
+- [#486][] Add confirms box when you do massive action. ([@manuelmeurer][])
+- [#487][] Add specific template to redmine notification with less useless data. ([@tvdeyen][])
+
+### Bug fixes
+
+- [#469][] Fix issue about the documentation of new heroku addons usage.
+  ([@adamjt][])
+- [#455][] Avoid raising exception if you comment an exception and no
+  other user are define to received this comment. ([@alvarobp][])
+- [#453][] Fix ruby 2.0.0 incompatibilities with gem ([@SamSaffron][])
+- [#476][] Fix javascript notifier issue with IE8 ([@sdepold][])
+- [#466][] Fix not see problem if octokit gem not define ([@tamaloa][])
+- [#460][] Fix issue when you try see user with gravatar activate but no
+  email define to this user ([@ivanyv][])
+- [#478][] Fix issue about calculation of statisque of problem after
+  merge ([@shingara][])
+
+<!-- Issue fix -->
+
+[#253]: https://github.com/errbit/errbit/issues/253
+[#343]: https://github.com/errbit/errbit/issues/343
+[#428]: https://github.com/errbit/errbit/issues/428
+[#453]: https://github.com/errbit/errbit/issues/453
+[#455]: https://github.com/errbit/errbit/issues/455
+[#456]: https://github.com/errbit/errbit/issues/456
+[#457]: https://github.com/errbit/errbit/issues/457
+[#460]: https://github.com/errbit/errbit/issues/460
+[#466]: https://github.com/errbit/errbit/issues/466
+[#468]: https://github.com/errbit/errbit/issues/468
+[#469]: https://github.com/errbit/errbit/issues/469
+[#474]: https://github.com/errbit/errbit/issues/474
+[#475]: https://github.com/errbit/errbit/issues/475
+[#476]: https://github.com/errbit/errbit/issues/476
+[#478]: https://github.com/errbit/errbit/issues/478
+[#487]: https://github.com/errbit/errbit/issues/487
+[#486]: https://github.com/errbit/errbit/issues/486
+[#492]: https://github.com/errbit/errbit/issues/492
+[#503]: https://github.com/errbit/errbit/issues/503
+[#506]: https://github.com/errbit/errbit/issues/506
+[#508]: https://github.com/errbit/errbit/issues/508
+[#514]: https://github.com/errbit/errbit/issues/514
+[#516]: https://github.com/errbit/errbit/issues/516
+[#517]: https://github.com/errbit/errbit/issues/517
+[#524]: https://github.com/errbit/errbit/issues/524
+[#526]: https://github.com/errbit/errbit/issues/526
+[#528]: https://github.com/errbit/errbit/issues/528
+[#530]: https://github.com/errbit/errbit/issues/530
+[#531]: https://github.com/errbit/errbit/issues/531
+[#532]: https://github.com/errbit/errbit/issues/532
+[#542]: https://github.com/errbit/errbit/issues/542
+
+<!-- Contributor on Errbit Thanks to all of them -->
+
+[@2called-chaos]: https://github.com/2called-chaos
+[@Gonzih]: https://github.com/Gonzih
+[@SamSaffron]: https://github.com/SamSaffron
+[@adamjt]: https://github.com/adamjt
+[@aliscott]: http://github.com/aliscott
+[@alvarobp]: https://github.com/alvarobp
+[@arthurnn]: https://github.com/arthurnn
+[@bacongobbler]: https://github.com/bacongobbler
+[@boblail]: https://github.com/boblail
+[@brendonrapp]: https://github.com/brendonrapp
+[@chadcf]: https://github.com/chadcf
+[@ivanyv]: https://github.com/ivanyv
+[@jeroenj]: https://github.com/jeroenj
+[@manuelmeurer]: https://github.com/manuelmeurer
+[@mildavw]: https://github.com/mildavw
+[@mildavw]: https://github.com/mildavw
+[@nfedyashev]: https://github.com/nfedyashev
+[@parallel588]: https://github.com/parallel588
+[@roryf]: https://github.com/roryf
+[@sdepold]: https://github.com/sdepold
+[@shingara]: https://github.com/shingara
+[@tamaloa]: https://github.com/tamaloa
+[@tvdeyen]: https://github.com/tvdeyen
+[@williamn]: https://github.com/williamn
+[@xenji]: https://github.com/xenji
@@ -0,0 +1,75 @@
+## 0.3.0 - Not released yet
+
+- [@arthurnn][]
+- [@shingara][]
+
+[@shingara]: https://github.com/shingara
+[@arthurnn]: https://github.com/arthurnn
+
+## 0.2.1 - Not released yet
+
+- [@shingara][]
+- [@tscolari][]
+
+[@shingara]: https://github.com/shingara
+[@tscolari]: https://github.com/tscolari
+
+## 0.2.0 - 2013-09-11
+
+- [@2called-chaos][]
+- [@Gonzih][]
+- [@aliscott][]
+- [@arthurnn][]
+- [@bacongobbler][]
+- [@boblail][]
+- [@brendonrapp][]
+- [@jeroenj][]
+- [@mildavw][]
+- [@nfedyashev][]
+- [@parallel588][]
+- [@roryf][]
+- [@shingara][]
+- [@williamn][]
+- [@xenji][]
+
+## 0.1.0 - 2013-05-29
+
+- [@manuelmeurer][]
+- [@mildavw][]
+- [@chadcf][]
+- [@shingara][]
+- [@tvdeyen][]
+- [@adamjt][]
+- [@alvarobp][]
+- [@SamSaffron][]
+- [@sdepold][]
+- [@tamaloa][]
+- [@ivanyv][]
+
+<!-- Contributor on Errbit Thanks to all of them -->
+
+[@2called-chaos]: https://github.com/2called-chaos
+[@Gonzih]: https://github.com/Gonzih
+[@SamSaffron]: https://github.com/SamSaffron
+[@adamjt]: https://github.com/adamjt
+[@aliscott]: http://github.com/aliscott
+[@alvarobp]: https://github.com/alvarobp
+[@arthurnn]: https://github.com/arthurnn
+[@bacongobbler]: https://github.com/bacongobbler
+[@boblail]: https://github.com/boblail
+[@brendonrapp]: https://github.com/brendonrapp
+[@chadcf]: https://github.com/chadcf
+[@ivanyv]: https://github.com/ivanyv
+[@jeroenj]: https://github.com/jeroenj
+[@manuelmeurer]: https://github.com/manuelmeurer
+[@mildavw]: https://github.com/mildavw
+[@mildavw]: https://github.com/mildavw
+[@nfedyashev]: https://github.com/nfedyashev
+[@parallel588]: https://github.com/parallel588
+[@roryf]: https://github.com/roryf
+[@sdepold]: https://github.com/sdepold
+[@shingara]: https://github.com/shingara
+[@tamaloa]: https://github.com/tamaloa
+[@tvdeyen]: https://github.com/tvdeyen
+[@williamn]: https://github.com/williamn
+[@xenji]: https://github.com/xenji
 source 'http://rubygems.org'
-gem 'rails', '3.2.8'
-gem 'mongoid', '~> 2.4.10'
-gem 'mongoid_rails_migrations'
-gem 'devise', '~> 1.5.3'
+gem 'rails', '~> 3.2.13'
+gem 'mongoid', '~> 3.1.4'
+
+gem 'mongoid_rails_migrations', '~> 1.0.1'
+gem 'devise'
 gem 'haml'
-gem 'htmlentities', "~> 4.3.0"
+gem 'htmlentities'
 gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
-gem 'useragent', '~> 0.3.1'
-gem 'inherited_resources'
+gem 'useragent'
+gem 'decent_exposure'
+gem 'strong_parameters'
 gem 'SystemTimer', :platform => :ruby_18
-gem 'actionmailer_inline_css', "~> 1.3.0"
-gem 'kaminari'
-gem 'rack-ssl-enforcer'
+gem 'actionmailer_inline_css'
+gem 'kaminari', '>= 0.14.1'
+gem 'rack-ssl-enforcer', :require => false
+# fabrication 1.3.0 is last supporting ruby 1.8. Update when stop supporting this version too
 gem 'fabrication', "~> 1.3.0"   # Used for both tests and demo data
-gem 'rails_autolink', '~> 1.0.9'
+gem 'rails_autolink'
 # Please don't update hoptoad_notifier to airbrake.
 # It's for internal use only, and we monkeypatch certain methods
 gem 'hoptoad_notifier', "~> 2.4"
@@ -35,68 +38,87 @@ gem &#39;pivotal-tracker&#39;
 # Fogbugz
 gem 'ruby-fogbugz', :require => 'fogbugz'
 # Github Issues
-gem 'octokit', '~> 1.0.0'
+gem 'octokit'
 # Gitlab
-gem 'gitlab'
+gem 'gitlab', :git => 'https://github.com/NARKOZ/gitlab.git'
 # Bitbucket Issues
-gem 'bitbucket_rest_api'
+gem 'bitbucket_rest_api', :require => false
+
+# Unfuddle
+gem "taskmapper", "~> 0.8.0"
+gem "taskmapper-unfuddle", "~> 0.7.0"
+
+# Jira
+gem 'jira-ruby', :require => 'jira'
 # Notification services
 # ---------------------------------------
-# Campfire
-gem 'campy'
+# Campfire ( We can't upgrade to 1.0 because drop support of ruby 1.8
+gem 'campy', '0.1.3'
 # Hipchat
 gem 'hipchat'
 # Google Talk
-gem 'xmpp4r'
+gem 'xmpp4r', :require => ["xmpp4r", "xmpp4r/muc"]
 # Hoiio (SMS)
 gem 'hoi'
 # Pushover (iOS Push notifications)
 gem 'rushover'
+# Hubot
+gem 'httparty'
+# Flowdock
+gem 'flowdock'
 # Authentication
 # ---------------------------------------
 # GitHub OAuth
 gem 'omniauth-github'
-
-platform :ruby do
-  gem 'mongo', '= 1.6.2'
-  gem 'bson', '= 1.6.2'
-  gem 'bson_ext', '= 1.6.2'
-end
-
 gem 'ri_cal'
 gem 'yajl-ruby', :require => "yajl"
 group :development, :test do
   gem 'rspec-rails', '~> 2.6'
   gem 'webmock', :require => false
-  unless ENV["CI"]
-    gem 'ruby-debug', :platform => :mri_18
-    gem 'debugger', :platform => :mri_19
-    gem 'pry-rails'
-  end
+  gem 'airbrake', :require => false
+  gem 'ruby-debug', :platform => :mri_18
+  gem 'debugger', :platform => :mri_19
+  gem 'pry-rails'
 #  gem 'rpm_contrib'
 #  gem 'newrelic_rpm'
+  gem 'quiet_assets'
+end
+
+group :development do
   gem 'capistrano'
+
+  # better errors
+  gem 'better_errors'    , :platform => :ruby_19
+  gem 'binding_of_caller', :platform => :ruby_19
+  gem 'meta_request'     , :platform => :ruby_19
+  gem 'foreman'
+
+  # Use thin for development
+  gem 'thin', :group => :development, :platform => :ruby
+
 end
 group :test do
-  gem 'capybara'
+  # Capybara 2.1.0 no more support 1.8.7 ruby version
+  gem 'capybara', "~> 2.0.1"
   gem 'launchy'
-  gem 'database_cleaner', '~> 0.6.0'
+  # DatabaseCleaner 1.0.0 drop the support of ruby 1.8.7
+  gem 'database_cleaner', '~> 0.9.0'
   gem 'email_spec'
-  gem 'timecop'
+  gem 'timecop', '0.6.1' # last version compatible to ruby 1.8
+  gem 'coveralls', :require => false
+  gem 'mongoid-rspec', :require => false
 end
 group :heroku, :production 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.
@@ -104,7 +126,10 @@ group :assets do
   gem 'execjs'
   gem 'therubyracer', :platform => :ruby  # C Ruby (MRI) or Rubinius, but NOT Windows
   gem 'uglifier',     '>= 1.0.3'
+  # We can't upgrade because not compatible to jquery >= 1.9.
+  # To do that, we need fix the rails.js
+  gem 'jquery-rails', '~> 2.1.4'
+  gem 'pjax_rails'
   gem 'underscore-rails'
+  gem 'turbo-sprockets-rails3'
 end
-
-gem 'turbo-sprockets-rails3'
+GIT
+  remote: https://github.com/NARKOZ/gitlab.git
+  revision: 7a00d38c53335010d2fb8a233247fe2c97338903
+  specs:
+    gitlab (2.2.0)
+      httparty
+
 GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionmailer_inline_css (1.3.1)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionmailer_inline_css (1.5.3)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.5)
+    airbrake (3.1.13)
+      builder
+      json
     arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    bitbucket_rest_api (0.1.1)
+    bcrypt-ruby (3.1.1)
+    better_errors (0.9.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    bitbucket_rest_api (0.1.2)
       faraday (~> 0.8.1)
       faraday_middleware (~> 0.8.1)
       hashie (~> 1.2.0)
       multi_json (~> 1.3)
       nokogiri (~> 1.5.2)
       simple_oauth
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
     builder (3.0.4)
+    callsite (0.0.11)
     campy (0.1.3)
       multi_json (~> 1.0)
-    capistrano (2.13.5)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capybara (1.1.2)
+    capybara (2.0.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
-    coderay (1.0.6)
+      xpath (~> 1.0.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
+    colorize (0.5.8)
     columnize (0.3.6)
-    crack (0.3.1)
-    css_parser (1.2.6)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    css_parser (1.3.4)
       addressable
-      rdoc
-    daemons (1.1.8)
-    database_cleaner (0.6.7)
-    debugger (1.2.1)
+    daemons (1.1.9)
+    database_cleaner (0.9.1)
+    debug_inspector (0.0.2)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.4)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.4)
-    devise (1.5.3)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    decent_exposure (2.2.1)
+    devise (2.2.7)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
-    diff-lcs (1.1.3)
-    email_spec (1.2.1)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    diff-lcs (1.2.4)
+    dotenv (0.8.0)
+    email_spec (1.5.0)
+      launchy (~> 2.1)
       mail (~> 2.2)
-      rspec (~> 2.0)
     erubis (2.7.0)
-    eventmachine (0.12.10)
+    eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     fabrication (1.3.2)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     faraday_middleware (0.8.8)
       faraday (>= 0.7.4, < 0.9)
-    ffi (1.1.4)
-    haml (3.1.6)
+    ffi (1.9.0)
+    flowdock (0.3.1)
+      httparty (~> 0.7)
+      multi_json
+    foreman (0.63.0)
+      dotenv (>= 0.7)
+      thor (>= 0.13.6)
+    haml (4.0.3)
+      tilt
     happymapper (0.4.0)
       libxml-ruby (~> 2.0)
-    has_scope (0.5.1)
     hashie (1.2.0)
-    highline (1.6.15)
-    hike (1.2.1)
-    hipchat (0.4.1)
+    highline (1.6.19)
+    hike (1.2.3)
+    hipchat (0.11.0)
       httparty
     hoi (0.0.6)
       httparty (> 0.6.0)
@@ -113,152 +142,171 @@ GEM
       activesupport
       builder
     htmlentities (4.3.1)
-    httparty (0.9.0)
+    httparty (0.11.0)
       multi_json (~> 1.0)
-      multi_xml
-    httpauth (0.1)
+      multi_xml (>= 0.5.2)
+    httpauth (0.2.0)
     i18n (0.6.1)
-    inherited_resources (1.3.1)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6)
+    jira-ruby (0.1.2)
+      activesupport
+      oauth
+      railties
     journey (1.0.4)
-    json (1.7.5)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.7.4)
-    launchy (2.1.2)
+    kgio (2.8.0)
+    launchy (2.3.0)
       addressable (~> 2.3)
-    libv8 (3.3.10.4)
-    libwebsocket (0.1.5)
-      addressable
-    libxml-ruby (2.3.3)
+    libv8 (3.16.14.3)
+    libxml-ruby (2.7.0)
     lighthouse-api (2.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.1)
-    mime-types (1.19)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.10)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
+    meta_request (0.2.8)
+      callsite
+      rack-contrib
+      railties
+    method_source (0.8.2)
+    mime-types (1.24)
+    mongoid (3.1.4)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    mongoid_rails_migrations (0.0.14)
-      activesupport (>= 3.0.0)
+    mongoid-rspec (1.9.0)
+      mongoid (>= 3.0.1)
+      rake
+      rspec (>= 2.14)
+    mongoid_rails_migrations (1.0.1)
+      activesupport (>= 3.2.0)
       bundler (>= 1.0.0)
-      rails (>= 3.0.0)
-      railties (>= 3.0.0)
-    multi_json (1.3.6)
-    multi_xml (0.5.1)
-    multipart-post (1.1.5)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    nokogiri (1.5.5)
-    oauth2 (0.8.0)
+      rails (>= 3.2.0)
+      railties (>= 3.2.0)
+    moped (1.5.1)
+    multi_json (1.7.9)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.8)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    nokogiri (1.5.10)
+    nokogiri-happymapper (0.5.7)
+      nokogiri (~> 1.5)
+    oauth (0.4.7)
+    oauth2 (0.8.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    octokit (1.0.7)
+    octokit (1.18.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
       faraday_middleware (~> 0.8)
       hashie (~> 1.2)
       multi_json (~> 1.3)
-    omniauth (1.1.1)
-      hashie (~> 1.2)
+    omniauth (1.1.4)
+      hashie (>= 1.2, < 3)
       rack
-    omniauth-github (1.0.2)
+    omniauth-github (1.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    orm_adapter (0.0.7)
+    origin (1.1.0)
+    orm_adapter (0.4.0)
     oruen_redmine_client (0.0.1)
       activeresource (>= 2.3.0)
-    pivotal-tracker (0.5.4)
-      builder
+    pivotal-tracker (0.5.10)
       builder
-      happymapper (>= 0.3.2)
+      crack
       happymapper (>= 0.3.2)
       nokogiri (>= 1.4.3)
-      nokogiri (~> 1.4)
-      rest-client (~> 1.6.0)
+      nokogiri (>= 1.5.5)
+      nokogiri-happymapper (>= 0.5.4)
       rest-client (~> 1.6.0)
+    pjax_rails (0.3.4)
+      jquery-rails
     polyglot (0.3.3)
     premailer (1.7.3)
       css_parser (>= 1.1.9)
       htmlentities (>= 4.0.0)
-    pry (0.9.9.6)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    pry-rails (0.2.0)
-      pry
-    rack (1.4.1)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-rails (0.3.2)
+      pry (>= 0.9.10)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-contrib (1.1.0)
+      rack (>= 0.9.1)
+    rack-ssl (1.3.3)
       rack
-    rack-ssl-enforcer (0.2.4)
+    rack-ssl-enforcer (0.2.5)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    rails_autolink (1.0.9)
-      rails (~> 3.1)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.13)
+    rails_autolink (1.1.0)
+      rails (> 3.1)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.10.0)
-    rake (0.9.2.2)
+    raindrops (0.11.0)
+    rake (10.1.0)
     rbx-require-relative (0.0.9)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    responders (0.9.2)
-      railties (~> 3.1)
+    ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     ri_cal (0.8.8)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    rspec-rails (2.11.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -267,52 +315,71 @@ GEM
     ruby-fogbugz (0.1.1)
       crack
     rubyzip (0.9.9)
-    rushover (0.1.1)
+    rushover (0.3.0)
       json
       rest-client
-    selenium-webdriver (2.25.0)
+    safe_yaml (0.9.5)
+    selenium-webdriver (2.35.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    simple_oauth (0.1.9)
-    slop (2.4.4)
-    sprockets (2.1.3)
+      websocket (~> 1.0.4)
+    simple_oauth (0.2.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.6)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
-    thin (1.4.1)
+    strong_parameters (0.2.1)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      railties (~> 3.0)
+    taskmapper (0.8.0)
+      activeresource (~> 3.0)
+      activesupport (~> 3.0)
+      hashie (~> 1.2)
+    taskmapper-unfuddle (0.7.0)
+      addressable (~> 2.2)
+      taskmapper (~> 0.8)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
+      ref
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    timecop (0.3.5)
-    treetop (1.4.10)
+    thor (0.18.1)
+    tilt (1.4.1)
+    timecop (0.6.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbo-sprockets-rails3 (0.2.12)
-      railties (>= 3.1.0, < 3.2.9)
+    turbo-sprockets-rails3 (0.3.9)
+      railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    tzinfo (0.3.33)
-    uglifier (1.2.7)
+    tzinfo (0.3.37)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    underscore-rails (1.4.2.1)
-    unicorn (4.3.1)
+      multi_json (~> 1.0, >= 1.0.2)
+    underscore-rails (1.5.1)
+    unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    useragent (0.3.2)
-    warden (1.2.1)
+    useragent (0.6.0)
+    warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.8.7)
+    webmock (1.13.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
+    websocket (1.0.7)
     xmpp4r (0.5)
-    xpath (0.1.4)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
@@ -321,53 +388,67 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer
-  actionmailer_inline_css (~> 1.3.0)
+  actionmailer_inline_css
+  airbrake
+  better_errors
+  binding_of_caller
   bitbucket_rest_api
-  bson (= 1.6.2)
-  bson_ext (= 1.6.2)
-  campy
+  campy (= 0.1.3)
   capistrano
-  capybara
-  database_cleaner (~> 0.6.0)
+  capybara (~> 2.0.1)
+  coveralls
+  database_cleaner (~> 0.9.0)
   debugger
-  devise (~> 1.5.3)
+  decent_exposure
+  devise
   email_spec
   execjs
   fabrication (~> 1.3.0)
+  flowdock
+  foreman
+  gitlab!
   haml
   hipchat
   hoi
   hoptoad_notifier (~> 2.4)
-  htmlentities (~> 4.3.0)
-  inherited_resources
-  kaminari
+  htmlentities
+  httparty
+  jira-ruby
+  jquery-rails (~> 2.1.4)
+  kaminari (>= 0.14.1)
   launchy
   lighthouse-api
-  mongo (= 1.6.2)
-  mongoid (~> 2.4.10)
-  mongoid_rails_migrations
-  octokit (~> 1.0.0)
+  meta_request
+  mongoid (~> 3.1.4)
+  mongoid-rspec
+  mongoid_rails_migrations (~> 1.0.1)
+  octokit
   omniauth-github
   oruen_redmine_client
   pivotal-tracker
+  pjax_rails
   pry-rails
+  quiet_assets
   rack-ssl
   rack-ssl-enforcer
-  rails (= 3.2.8)
-  rails_autolink (~> 1.0.9)
+  rails (~> 3.2.13)
+  rails_autolink
   ri_cal
   rspec-rails (~> 2.6)
   ruby-debug
   ruby-fogbugz
   rushover
+  strong_parameters
+  taskmapper (~> 0.8.0)
+  taskmapper-unfuddle (~> 0.7.0)
   therubyracer
   thin
-  timecop
+  timecop (= 0.6.1)
   turbo-sprockets-rails3
   uglifier (>= 1.0.3)
   underscore-rails
   unicorn
-  useragent (~> 0.3.1)
+  useragent
   webmock
   xmpp4r
   yajl-ruby
-Copyright (c) 2010 Jared Pace
+Copyright (c) 2013 errbit team
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 \ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-web:   bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
-# Errbit [![TravisCI][travis-img-url]][travis-ci-url] [![Code Climate][codeclimate-img-url]][codeclimate-url]
+# Errbit [![TravisCI][travis-img-url]][travis-ci-url] [![Code Climate][codeclimate-img-url]][codeclimate-url] [![Coveralls][coveralls-img-url]][coveralls-url] [![Dependency Status][gemnasium-img-url]][gemnasium-url]
 [travis-img-url]: https://secure.travis-ci.org/errbit/errbit.png?branch=master
 [travis-ci-url]: http://travis-ci.org/errbit/errbit
-[codeclimate-img-url]: https://codeclimate.com/badge.png
+[codeclimate-img-url]: https://codeclimate.com/github/errbit/errbit.png
 [codeclimate-url]: https://codeclimate.com/github/errbit/errbit
+[coveralls-img-url]: https://coveralls.io/repos/errbit/errbit/badge.png?branch=master
+[coveralls-url]:https://coveralls.io/r/errbit/errbit
+[gemnasium-img-url]:https://gemnasium.com/errbit/errbit.png
+[gemnasium-url]:https://gemnasium.com/errbit/errbit
+
 ### 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,
+It is [Airbrake](http://airbrake.io) (formerly known as Hoptoad) API compliant,
 so if you are already using Airbrake, you can just point the `airbrake` gem to your Errbit server.
@@ -56,9 +61,9 @@ Errbit may be a good fit for you if:
 * You want to add customer features to your error catcher
 * You're crazy and love managing servers
-If this doesn't sound like you, you should probably stick with [Airbrake](http://airbrakeapp.com).
-The [Thoughtbot](http://thoughtbot.com) guys offer great support for it and it is much more worry-free.
-They have a free package and even offer a *"Airbrake behind your firewall"* solution.
+If this doesn't sound like you, you should probably stick with a hosted service such as
+[Airbrake](http://airbrake.io).
+
 Mailing List
 ------------
@@ -73,13 +78,19 @@ There is a demo available at [http://errbit-demo.herokuapp.com/](http://errbit-d
 Email: demo@errbit-demo.herokuapp.com<br/>
 Password: password
+# Requirement
+
+The list of requirement to install Errbit is :
+
+ * Ruby 1.9.3 or higher
+ * MongoDB 2.2.0 or higher
+
 Installation
 ------------
-*Note*: This app is intended for people with experience deploying and maintining
+*Note*: This app is intended for people with experience deploying and maintaining
 Rails applications. If you're uncomfortable with any step below then Errbit is not
-for you. Checkout [Airbrake](http://airbrakeapp.com) from the guys over at
-[Thoughtbot](http://thoughtbot.com), which Errbit is based on.
+for you.
 **Set up your local box or server(Ubuntu):**
@@ -87,7 +98,7 @@ for you. Checkout [Airbrake](http://airbrakeapp.com) from the guys over at
 ```bash
 apt-get update
-apt-get install mongodb
+apt-get install mongodb-10gen
 ```
   * Install libxml and libcurl
@@ -124,21 +135,19 @@ rake errbit:bootstrap
 script/rails server
 ```
-**Deploying:**
-
-  * Bootstrap Errbit. This will copy over config.yml and also seed the database.
-
-```bash
-rake errbit:bootstrap
-```
+Deploying:
+----------
-  * Update the deploy.rb file with information about your server
+  * Copy `config/deploy.example.rb` to `config/deploy.rb`
+  * Update the `deploy.rb` or `config.yml` file with information about your server
   * Setup server and deploy
 ```bash
-cap deploy:setup deploy
+cap deploy:setup deploy db:create_mongoid_indexes
 ```
+(Note: The capistrano deploy script will automatically generate a unique secret token.)
+
 **Deploying to Heroku:**
   * Clone the repository
@@ -146,24 +155,32 @@ cap deploy:setup deploy
 ```bash
 git clone http://github.com/errbit/errbit.git
 ```
+  * Update `db/seeds.rb` with admin credentials for your initial login.
+
+  * Run `bundle`
   * Create & configure for Heroku
 ```bash
 gem install heroku
-heroku create example-errbit --stack cedar
-heroku addons:add mongolab:starter
+heroku create example-errbit
+# If you really want, you can define your stack and your buildpack. the default is good to us :
+# heroku create example-errbit --stack cedar --buildpack https://github.com/heroku/heroku-buildpack-ruby.git
+heroku addons:add mongolab:sandbox
 heroku addons:add sendgrid:starter
 heroku config:add HEROKU=true
+heroku config:add SECRET_TOKEN="$(bundle exec rake secret)"
 heroku config:add ERRBIT_HOST=some-hostname.example.com
 heroku config:add ERRBIT_EMAIL_FROM=example@example.com
 git push heroku master
 ```
-  * Seed the DB (_NOTE_: No bootstrap task is used on Heroku!)
+  * Seed the DB (_NOTE_: No bootstrap task is used on Heroku!) and
+    create index
 ```bash
 heroku run rake db:seed
+heroku run rake db:mongoid:create_indexes
 ```
   * If you are using a free database on Heroku, you may want to periodically clear resolved errors to free up space.
@@ -199,6 +216,12 @@ heroku run rake db:seed
 heroku addons:add deployhooks:http --url="http://YOUR_ERRBIT_HOST/deploys.txt?api_key=YOUR_API_KEY"
 ```
+  * You may also want to configure a different secret token for each deploy:
+
+```bash
+heroku config:add SECRET_TOKEN=some-secret-token
+```
+
   * Enjoy!
@@ -313,6 +336,7 @@ When upgrading Errbit, please run:
 git pull origin master # assuming origin is the github.com/errbit/errbit repo
 bundle install
 rake db:migrate
+rake assets:precompile
 ```
 If we change the way that data is stored, this will run any migrations to bring your database up to date.
@@ -340,6 +364,20 @@ it will be displayed under the *User Details* tab:
 (This tab will be hidden if no user information is available.)
+Adding javascript errors notifications
+--------------------------------------
+
+Errbit easily supports javascript errors notifications. You just need to add `config.js_notifier = true` to the errbit initializer in the rails app.
+
+```
+Errbit.configure do |config|
+  config.host    = 'YOUR-ERRBIT-HOST'
+  config.api_key = 'YOUR-PROJECT-API-KEY'
+  config.js_notifier = true
+end
+```
+
+Then get the `notifier.js` from `errbit/public/javascript/notifier.js` and add to `application.js` on your rails app or include `http://YOUR-ERRBIT-HOST/javascripts/notifier.js` on your `application.html.erb.`
 Issue Trackers
 --------------
@@ -387,9 +425,35 @@ card_type = Defect, status = Open, priority = Essential
 * Account is the host of your gitlab installation. i.e. **http://gitlab.example.com**
 * To authenticate, Errbit uses token-based authentication. Get your API Key in your user settings (or create special user for this purpose)
-* You also need to provide project name (shortname) or ID (number) for issues to be created
-* **Currently (as of 3.0), Gitlab has 2000 character limit for issue description.** It is necessary to turn it off at your instance, because Errbit issues body is much longer. Please comment validation line in issue model in models folder https://github.com/gitlabhq/gitlabhq/blob/master/app/models/issue.rb#L10
+* You also need to provide project ID (it needs to be Number) for issues to be created
+
+**Unfuddle Issues Integration**
+
+* Account is your unfuddle domain
+* Username your unfuddle username
+* Password your unfuddle password
+* Project id the id of your project where your ticket is create
+* Milestone id the id of your milestone where your ticket is create
+
+**Jira Issue Integration**
+
+* base_url the jira URL
+* context_path Context Path (Just "/" if empty otherwise with leading slash)
+* username HTTP Basic Auth User
+* password HTTP Basic Auth Password
+* project_id The project Key where the issue will be created
+* account Assign to this user. If empty, Jira takes the project default.
+* issue_component Website - Other
+* issue_type Issue type
+* issue_priority Priority
+
+Notification Service
+--------------------
+**Flowdock Notification**
+
+Allow notification to [Flowdock](https://www.flowdock.com/). See
+[complete documentation](docs/notifications/flowdock/index.md)
 What if Errbit has an error?
@@ -434,12 +498,28 @@ Solutions known to work are listed below:
   </tr>
 </table>
+Develop on Errbit
+-----------------
+
+A guide can help on this way on  [**Errbit Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md)
+
+## Other documentation
+
+* [All ENV variables availables to configure Errbit](docs/ENV-VARIABLES.md)
+
 TODO
 ----
 * Add ability for watchers to be configured for types of notifications they should receive
+People using Errbit
+-------------------
+
+See our wiki page for a [list of people and companies around the world who use Errbit](https://github.com/errbit/errbit/wiki/People-using-Errbit).
+Feel free to [edit this page](https://github.com/errbit/errbit/wiki/People-using-Errbit/_edit), and add your name and country to the list if you are using Errbit.
+
+
 Special Thanks
 --------------
@@ -448,10 +528,11 @@ Special Thanks
 * [Nathan Broadbent (@ndbroadbent)](https://github.com/ndbroadbent) - Maintaining Errbit and contributing many features
 * [Vasiliy Ermolovich (@nashby)](https://github.com/nashby) - Contributing and helping to resolve issues and pull requests
 * [Marcin Ciunelis (@martinciu)](https://github.com/martinciu) - Helping to improve Errbit's architecture
+* [Cyril Mougel (@shingara)](https://github.com/shingara) - Maintaining Errbit and contributing many features
 * [Relevance](http://thinkrelevance.com) - For giving me Open-source Fridays to work on Errbit and all my awesome co-workers for giving feedback and inspiration.
-* [Thoughtbot](http://thoughtbot.com) - For being great open-source advocates and setting the bar with [Airbrake](http://airbrakeapp.com).
+* [Thoughtbot](http://thoughtbot.com) - For being great open-source advocates and setting the bar with [Airbrake](http://airbrake.io).
-See the [contributors graph](https://github.com/errbit/errbit/graphs/contributors) for further details.
+See the [contributors graph](https://github.com/errbit/errbit/graphs/contributors) for further details. You can see another list of Contributors by release version on [CONTRIBUTORS.md]
 Contributing
@@ -474,10 +555,11 @@ and make **optional** features configurable via `config/config.yml`.
 * Add tests for it. This is important so we don't break it in a future version unintentionally.
 * 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)
 * Send us a pull request. Bonus points for topic branches.
+* Add you on the CONTRIBUTORS.md file on the current release
 Copyright
 ---------
-Copyright (c) 2010-2011 Jared Pace. See LICENSE for details.
+Copyright (c) 2010-2013 Errbit Team. See LICENSE for details.
+// We can't use jquery > 1.9
 //= require jquery
 //= require underscore
+// This rails.js version is not like the original.
+// We can't upgrade to the official version
 //= require rails
 //= require form
 //= require jquery.pjax
@@ -14,38 +14,28 @@ $(function() {
     bindRequiredPasswordMarks();
-    $('#watcher_name').live("click", function() {
-      $(this).closest('form').find('.show').removeClass('show');
-      $('#app_watchers_attributes_0_user_id').addClass('show');
-    });
-
-    $('#watcher_email').live("click", function() {
-      $(this).closest('form').find('.show').removeClass('show');
-      $('#app_watchers_attributes_0_email').addClass('show');
-    });
-
-    $('a.copy_config').live("click", function() {
+    // On page apps/:app_id/edit
+    $('a.copy_config').on("click", function() {
       $('select.choose_other_app').show().focus();
     });
-    $('select.choose_other_app').live("change", function() {
+    $('select.choose_other_app').on("change", function() {
       var loc = window.location;
       window.location.href = loc.protocol + "//" + loc.host + loc.pathname +
                              "?copy_attributes_from=" + $(this).val();
     });
-    $('input[type=submit][data-action]').click(function() {
+    $('input[type=submit][data-action]').live('click', function() {
       $(this).closest('form').attr('action', $(this).attr('data-action'));
     });
     $('.notice-pagination').each(function() {
-      $('.notice-pagination a').pjax('#content', { timeout: 2000});
-      $('#content').bind('pjax:start',  function() {
-  $('.notice-pagination-loader').css("visibility", "visible");
-        currentTab = $('.tab-bar ul li a.button.active').attr('rel');
-      });
+      $.pjax.defaults = {timeout: 2000};
-      $('#content').bind('pjax:end',  function() {
+      $('#content').pjax('.notice-pagination a').on('pjax:start', function() {
+        $('.notice-pagination-loader').css("visibility", "visible");
+        currentTab = $('.tab-bar ul li a.button.active').attr('rel');
+      }).on('pjax:end', function() {
         activateTabbedPanels();
       });
     });
@@ -83,7 +73,7 @@ $(function() {
   function toggleProblemsCheckboxes() {
     var checkboxToggler = $('#toggle_problems_checkboxes');
-    checkboxToggler.live("click", function() {
+    checkboxToggler.on("click", function() {
       $('input[name^="problems"]').each(function() {
         this.checked = checkboxToggler.get(0).checked;
       });
@@ -126,7 +116,7 @@ $(function() {
     $('td.backtrace_separator').hide();
   }
   // Show external backtrace lines when clicking separator
-  $('td.backtrace_separator span').live('click', show_external_backtrace);
+  $('td.backtrace_separator span').on('click', show_external_backtrace);
   // Hide external backtrace on page load
   hide_external_backtrace();
@@ -19,7 +19,8 @@ $(function(){
 });
 function activateNestedForms() {
-  $('.nested-wrapper').each(function(){
+  var wrapper = $('.nested-wrapper')
+  wrapper.each(function(){
     var wrapper = $(this);
     makeNestedItemsDestroyable(wrapper);
@@ -28,7 +29,7 @@ function activateNestedForms() {
     addLink.click(appendNestedItem);
     wrapper.append(addLink);
   });
-  $('.nested a.remove-nested').live('click',removeNestedItem);
+  wrapper.on('click','.nested a.remove-nested', removeNestedItem);
 }
 function makeNestedItemsDestroyable(wrapper) {
@@ -80,7 +81,7 @@ function activateTypeSelector(field_class, section_class) {
   $('div.'+field_class+' > div.'+section_class).not('.chosen').find('input')
     .attr('disabled','disabled').val('');
-  $('div.'+field_class+' input[name*=type]').live('click', function(){
+  $('div.'+field_class+' input[name*=type]').on('click', function(){
     // Look for section in 'data-section', and fall back to 'value'
     var chosen = $(this).data("section") || $(this).val();
     var wrapper = $(this).closest('.nested');
@@ -12,7 +12,7 @@
 //		$.jAlert( message, [title, callback] )
 //		$.jConfirm( message, [title, callback] )
 //		$.jPrompt( message, [value, title, callback] )
-// 
+//
 // History:
 //
 //		1.00 - Released (29 December 2008)
@@ -22,16 +22,16 @@
 //		1.2 - global methods removed.
 //
 // License:
-// 
+//
 // This plugin is dual-licensed under the GNU General Public License and the MIT License and
-// is copyright 2008 A Beautiful Site, LLC. 
+// is copyright 2008 A Beautiful Site, LLC.
 //
 (function($) {
-	
+
 	$.alerts = {
-		
+
 		// These properties can be read/written by accessing $.alerts.propertyName from your scripts at any time
-		
+
 		verticalOffset: -75,                // vertical offset of the dialog from center screen, in pixels
 		horizontalOffset: 0,                // horizontal offset of the dialog from center screen, in pixels/
 		repositionOnResize: true,           // re-centers the dialog on window resize
@@ -46,37 +46,37 @@
 			confirm: 'Confirm',
 			prompt: 'Prompt'
 		},
-		
+
 		// Public methods
-		
+
 		alert: function(message, title, callback) {
 			if (! title) title = $.alerts.titles.alert;
 			$.alerts._show(title, message, null, 'alert', function(result) {
 				if (callback) callback(result);
 			});
 		},
-		
+
 		confirm: function(message, title, callback) {
 			if (! title) title = $.alerts.titles.confirm;
 			$.alerts._show(title, message, null, 'confirm', function(result) {
 				if (callback) callback(result);
 			});
 		},
-			
+
 		prompt: function(message, value, title, callback) {
       if (! title) title = $.alerts.titles.prompt;
 			$.alerts._show(title, message, value, 'prompt', function(result) {
 				if(callback) callback(result);
 			});
 		},
-		
+
 		// Private methods
-		
+
 		_show: function(title, msg, value, type, callback) {
-			
+
 			$.alerts._hide();
 			$.alerts._overlay('show');
-			
+
 			$("BODY").append(
 			  '<div id="popup_container">' +
 			    '<h1 id="popup_title"></h1>' +
@@ -84,32 +84,34 @@
 			      '<div id="popup_message"></div>' +
 				'</div>' +
 			  '</div>');
-			
+
 			if( $.alerts.dialogClass ) $("#popup_container").addClass($.alerts.dialogClass);
-			
+
 			// IE6 Fix
-			var pos = ($.browser.msie && parseInt($.browser.version, 10) <= 6 ) ? 'absolute' : 'fixed'; 
-			
+      // No more $.browser in Jquery > 1,9 and not support IE 6
+			// var pos = ($.browser.msie && parseInt($.browser.version, 10) <= 6 ) ? 'absolute' : 'fixed';
+      var pos = 'fixed';
+
 			$("#popup_container").css({
 				position: pos,
 				zIndex: 99999,
 				padding: 0,
 				margin: 0
 			});
-			
+
 			$("#popup_title").text(title);
 			$("#popup_content").addClass(type);
 			$("#popup_message").text(msg);
 			$("#popup_message").html( $("#popup_message").text().replace(/\n/g, '<br />') );
-			
+
 			$("#popup_container").css({
 				minWidth: $("#popup_container").outerWidth(),
 				maxWidth: $("#popup_container").outerWidth()
 			});
-			
+
 			$.alerts._reposition();
 			$.alerts._maintainPosition(true);
-			
+
 			switch( type ) {
 			case 'alert':
 				$("#popup_message").after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /></div>');
@@ -158,20 +160,20 @@
 				break;
 			default: break;
 			}
-			
+
 			// Make draggable
 			if ($.alerts.draggable && $.fn.draggable) {
 				$("#popup_container").draggable({ handle: $("#popup_title") });
 				$("#popup_title").css({ cursor: 'move' });
 			}
 		},
-		
+
 		_hide: function() {
 			$("#popup_container").remove();
 			$.alerts._overlay('hide');
 			$.alerts._maintainPosition(false);
 		},
-		
+
 		_overlay: function(status) {
 			switch( status ) {
 				case 'show':
@@ -194,23 +196,23 @@
         default: break;
 			}
 		},
-		
+
 		_reposition: function() {
 			var top = (($(window).height() / 2) - ($("#popup_container").outerHeight() / 2)) + $.alerts.verticalOffset;
 			var left = (($(window).width() / 2) - ($("#popup_container").outerWidth() / 2)) + $.alerts.horizontalOffset;
 			if( top < 0 ) top = 0;
 			if( left < 0 ) left = 0;
-			
+
 			// IE6 fix
-			if( $.browser.msie && parseInt($.browser.version, 10) <= 6 ) top = top + $(window).scrollTop();
-			
+			// if( $.browser.msie && parseInt($.browser.version, 10) <= 6 ) top = top + $(window).scrollTop();
+
 			$("#popup_container").css({
 				top: top + 'px',
 				left: left + 'px'
 			});
 			$("#popup_overlay").height( $(document).height() );
 		},
-		
+
 		_maintainPosition: function(status) {
 			if( $.alerts.repositionOnResize ) {
 				switch(status) {
@@ -224,7 +226,7 @@
 				}
 			}
 		}
-		
+
 	};
-	
-})(jQuery);
 \ No newline at end of file
+
+})(jQuery);
@@ -1,18 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.6.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Jun 30 14:16:56 2011 -0400
- */
-(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
-shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
-)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
 \ No newline at end of file
@@ -1,264 +0,0 @@
-// jquery.pjax.js
-// copyright chris wanstrath
-// https://github.com/defunkt/jquery-pjax
-
-(function($){
-
-// When called on a link, fetches the href with ajax into the
-// container specified as the first parameter or with the data-pjax
-// attribute on the link itself.
-//
-// Tries to make sure the back button and ctrl+click work the way
-// you'd expect.
-//
-// Accepts a jQuery ajax options object that may include these
-// pjax specific options:
-//
-// container - Where to stick the response body. Usually a String selector.
-//             $(container).html(xhr.responseBody)
-//      push - Whether to pushState the URL. Defaults to true (of course).
-//   replace - Want to use replaceState instead? That's cool.
-//
-// For convenience the first parameter can be either the container or
-// the options object.
-//
-// Returns the jQuery object
-$.fn.pjax = function( container, options ) {
-  if ( options )
-    options.container = container
-  else
-    options = $.isPlainObject(container) ? container : {container:container}
-
-  // We can't persist $objects using the history API so we must use
-  // a String selector. Bail if we got anything else.
-  if ( options.container && typeof options.container !== 'string' ) {
-    throw "pjax container must be a string selector!"
-    return false
-  }
-
-  return this.live('click', function(event){
-    // Middle click, cmd click, and ctrl click should open
-    // links in a new tab as normal.
-    if ( event.which > 1 || event.metaKey )
-      return true
-
-    var defaults = {
-      url: this.href,
-      container: $(this).attr('data-pjax'),
-      clickedElement: $(this),
-      fragment: null
-    }
-
-    $.pjax($.extend({}, defaults, options))
-
-    event.preventDefault()
-  })
-}
-
-
-// Loads a URL with ajax, puts the response body inside a container,
-// then pushState()'s the loaded URL.
-//
-// Works just like $.ajax in that it accepts a jQuery ajax
-// settings object (with keys like url, type, data, etc).
-//
-// Accepts these extra keys:
-//
-// container - Where to stick the response body. Must be a String.
-//             $(container).html(xhr.responseBody)
-//      push - Whether to pushState the URL. Defaults to true (of course).
-//   replace - Want to use replaceState instead? That's cool.
-//
-// Use it just like $.ajax:
-//
-//   var xhr = $.pjax({ url: this.href, container: '#main' })
-//   console.log( xhr.readyState )
-//
-// Returns whatever $.ajax returns.
-var pjax = $.pjax = function( options ) {
-  var $container = $(options.container),
-      success = options.success || $.noop
-
-  // We don't want to let anyone override our success handler.
-  delete options.success
-
-  // We can't persist $objects using the history API so we must use
-  // a String selector. Bail if we got anything else.
-  if ( typeof options.container !== 'string' )
-    throw "pjax container must be a string selector!"
-
-  options = $.extend(true, {}, pjax.defaults, options)
-
-  if ( $.isFunction(options.url) ) {
-    options.url = options.url()
-  }
-
-  options.context = $container
-
-  options.success = function(data){
-    if ( options.fragment ) {
-      // If they specified a fragment, look for it in the response
-      // and pull it out.
-      var $fragment = $(data).find(options.fragment)
-      if ( $fragment.length )
-        data = $fragment.children()
-      else
-        return window.location = options.url
-    } else {
-        // If we got no data or an entire web page, go directly
-        // to the page and let normal error handling happen.
-        if ( !$.trim(data) || /<html/i.test(data) )
-          return window.location = options.url
-    }
-
-    // Make it happen.
-    this.html(data)
-
-    // If there's a <title> tag in the response, use it as
-    // the page's title.
-    var oldTitle = document.title,
-        title = $.trim( this.find('title').remove().text() )
-    if ( title ) document.title = title
-
-    // No <title>? Fragment? Look for data-title and title attributes.
-    if ( !title && options.fragment ) {
-      title = $fragment.attr('title') || $fragment.data('title')
-    }
-
-    var state = {
-      pjax: options.container,
-      fragment: options.fragment,
-      timeout: options.timeout
-    }
-
-    // If there are extra params, save the complete URL in the state object
-    var query = $.param(options.data)
-    if ( query != "_pjax=true" )
-      state.url = options.url + (/\?/.test(options.url) ? "&" : "?") + query
-
-    if ( options.replace ) {
-      window.history.replaceState(state, document.title, options.url)
-    } else if ( options.push ) {
-      // this extra replaceState before first push ensures good back
-      // button behavior
-      if ( !pjax.active ) {
-        window.history.replaceState($.extend({}, state, {url:null}), oldTitle)
-        pjax.active = true
-      }
-
-      window.history.pushState(state, document.title, options.url)
-    }
-
-    // Google Analytics support
-    if ( (options.replace || options.push) && window._gaq )
-      _gaq.push(['_trackPageview'])
-
-    // If the URL has a hash in it, make sure the browser
-    // knows to navigate to the hash.
-    var hash = window.location.hash.toString()
-    if ( hash !== '' ) {
-      window.location.href = hash
-    }
-
-    // Invoke their success handler if they gave us one.
-    success.apply(this, arguments)
-  }
-
-  // Cancel the current request if we're already pjaxing
-  var xhr = pjax.xhr
-  if ( xhr && xhr.readyState < 4) {
-    xhr.onreadystatechange = $.noop
-    xhr.abort()
-  }
-
-  pjax.options = options
-  pjax.xhr = $.ajax(options)
-  $(document).trigger('pjax', [pjax.xhr, options])
-
-  return pjax.xhr
-}
-
-
-pjax.defaults = {
-  timeout: 650,
-  push: true,
-  replace: false,
-  // We want the browser to maintain two separate internal caches: one for
-  // pjax'd partial page loads and one for normal page loads. Without
-  // adding this secret parameter, some browsers will often confuse the two.
-  data: { _pjax: true },
-  type: 'GET',
-  dataType: 'html',
-  beforeSend: function(xhr){
-    this.trigger('pjax:start', [xhr, pjax.options])
-    // start.pjax is deprecated
-    this.trigger('start.pjax', [xhr, pjax.options])
-    xhr.setRequestHeader('X-PJAX', 'true')
-  },
-  error: function(xhr, textStatus, errorThrown){
-    if ( textStatus !== 'abort' )
-      window.location = pjax.options.url
-  },
-  complete: function(xhr){
-    this.trigger('pjax:end', [xhr, pjax.options])
-    // end.pjax is deprecated
-    this.trigger('end.pjax', [xhr, pjax.options])
-  }
-}
-
-
-// Used to detect initial (useless) popstate.
-// If history.state exists, assume browser isn't going to fire initial popstate.
-var popped = ('state' in window.history), initialURL = location.href
-
-
-// popstate handler takes care of the back and forward buttons
-//
-// You probably shouldn't use pjax on pages with other pushState
-// stuff yet.
-$(window).bind('popstate', function(event){
-  // Ignore inital popstate that some browsers fire on page load
-  var initialPop = !popped && location.href == initialURL
-  popped = true
-  if ( initialPop ) return
-
-  var state = event.state
-
-  if ( state && state.pjax ) {
-    var container = state.pjax
-    if ( $(container+'').length )
-      $.pjax({
-        url: state.url || location.href,
-        fragment: state.fragment,
-        container: container,
-        push: false,
-        timeout: state.timeout
-      })
-    else
-      window.location = location.href
-  }
-})
-
-
-// Add the state property to jQuery's event object so we can use it in
-// $(window).bind('popstate')
-if ( $.inArray('state', $.event.props) < 0 )
-  $.event.props.push('state')
-
-
-// Is pjax supported by this browser?
-$.support.pjax =
-  window.history && window.history.pushState && window.history.replaceState
-  // pushState isn't reliable on iOS yet.
-  && !navigator.userAgent.match(/(iPod|iPhone|iPad|WebApps\/.+CFNetwork)/)
-
-
-// Fall back to normalcy for older browsers.
-if ( !$.support.pjax ) {
-  $.pjax = function( options ) {
-    window.location = $.isFunction(options.url) ? options.url() : options.url
-  }
-  $.fn.pjax = function() { return this }
-}
-
-})(jQuery);
 /**
  * Unobtrusive scripting adapter for jQuery
  *
- * Requires jQuery 1.6.0 or later.
+ * Requires jQuery 1.6.0. Not compatible to jquery > 1.9
  * https://github.com/rails/jquery-ujs
  * Uploading file using rails.js
@@ -131,11 +131,11 @@
           method = element.data('method');
           url = element.data('url');
           data = element.serialize();
-          if (element.data('params')) data = data + "&" + element.data('params'); 
+          if (element.data('params')) data = data + "&" + element.data('params');
         } else {
           method = element.data('method');
           url = element.attr('href');
-          data = element.data('params') || null; 
+          data = element.data('params') || null;
         }
         options = {
@@ -304,7 +304,7 @@ form label.inline { display: inline; }
 form .checkbox label { display: inline; }
 form .required label { padding-right: 20px; background: transparent url(images/icons/required.png) right 50% no-repeat; }
 form .field_with_errors label { color: #900; }
-form input[type=text], form input[type=password] {
+form input[type=text], form input[type=password], form input[type=email] {
   width: 96%; padding: 0.8em;
   font-size: 1em;
   color: #787878; border: 1px solid #C6C6C6;
@@ -316,7 +316,7 @@ form textarea {
 }
 form textarea.short { height: 8em; }
 form textarea.supershort { height: 4em; }
-form input[type=text]:focus, form input[type=password]:focus, form textarea:focus {
+form input[type=text]:focus, form input[type=password]:focus, form input[type=email]:focus, form textarea:focus {
   box-shadow: 0px 0px 4px #69C;
   -moz-box-shadow: 0px 0px 4px #69C;
   -webkit-box-shadow: 0px 0px 4px #69C
@@ -654,7 +654,6 @@ table.errs td.message a {
     overflow: hidden;
     text-overflow: ellipsis;
     -o-text-overflow: ellipsis;
-    white-space: nowrap;
   /* ------ */
 }
 table.errs td.message em {
@@ -714,7 +713,9 @@ table.deploys td.when {
 .notice-pagination-loader {
   visibility: hidden;
   float: left;
-  margin-right: 2em;
+  width: 16px;
+  height: 16px;
+  margin-right: 1em;
 }
 .notice-pagination-loader img {
   vertical-align: middle
 class Api::V1::NoticesController < ApplicationController
   respond_to :json, :xml
-  
+
   def index
     query = {}
     fields = %w{created_at message error_class}
-    
+
     if params.key?(:start_date) && params.key?(:end_date)
       start_date = Time.parse(params[:start_date]).utc
       end_date = Time.parse(params[:end_date]).utc
       query = {:created_at => {"$lte" => end_date, "$gte" => start_date}}
     end
-    
-    results = benchmark("[api/v1/notices_controller] query time") { Mongoid.master["notices"].find(query, :fields => fields).to_a }
-    
+
+    results = benchmark("[api/v1/notices_controller] query time") do
+      Notice.where(query).with(:consistency => :strong).only(fields).to_a
+    end
+
     respond_to do |format|
       format.html { render :json => Yajl.dump(results) } # render JSON if no extension specified on path
       format.json { render :json => Yajl.dump(results) }
       format.xml  { render :xml  => results }
     end
   end
-  
+
 end
 class Api::V1::ProblemsController < ApplicationController
   respond_to :json, :xml
-  
+
   def index
     query = {}
     fields = %w{app_id app_name environment message where first_notice_at last_notice_at resolved resolved_at notices_count}
-    
+
     if params.key?(:start_date) && params.key?(:end_date)
       start_date = Time.parse(params[:start_date]).utc
       end_date = Time.parse(params[:end_date]).utc
       query = {:first_notice_at=>{"$lte"=>end_date}, "$or"=>[{:resolved_at=>nil}, {:resolved_at=>{"$gte"=>start_date}}]}
     end
-    
-    results = benchmark("[api/v1/problems_controller] query time") { Mongoid.master["problems"].find(query, :fields => fields).to_a }
-    
+
+    results = benchmark("[api/v1/problems_controller] query time") do
+      Problem.where(query).with(:consistency => :strong).only(fields).to_a
+    end
+
     respond_to do |format|
       format.html { render :json => Yajl.dump(results) } # render JSON if no extension specified on path
       format.json { render :json => Yajl.dump(results) }
       format.xml  { render :xml  => results }
     end
   end
-  
+
 end
@@ -0,0 +1,41 @@
+class Api::V1::StatsController < ApplicationController
+  respond_to :json, :xml
+
+  # The stats API only requires an api_key for the given app.
+  skip_before_filter :authenticate_user!
+  before_filter :require_api_key_or_authenticate_user!
+
+  def app
+    if problem = @app.problems.order_by(:last_notice_at.desc).first
+      @last_error_time = problem.last_notice_at
+    end
+
+    stats = {
+      :name => @app.name,
+      :last_error_time => @last_error_time,
+      :unresolved_errors => @app.unresolved_count
+    }
+
+    respond_to do |format|
+      format.html { render :json => Yajl.dump(stats) } # render JSON if no extension specified on path
+      format.json { render :json => Yajl.dump(stats) }
+      format.xml  { render :xml  => stats }
+    end
+  end
+
+
+  protected
+
+  def require_api_key_or_authenticate_user!
+    if params[:api_key].present?
+      if @app = App.where(:api_key => params[:api_key]).first
+        return true
+      end
+    end
+
+    authenticate_user!
+  end
+
+end
+
+
@@ -13,12 +13,28 @@ class ApplicationController &lt; ActionController::Base
   rescue_from ActionController::RedirectBackError, :with => :redirect_to_root
+  class StrongParametersWithEagerAttributesStrategy < DecentExposure::StrongParametersStrategy
+    def attributes
+      super
+      @attributes ||= params[inflector.param_key] || {}
+    end
+  end
+
+  decent_configuration do
+    strategy StrongParametersWithEagerAttributesStrategy
+  end
 protected
+  ##
+  # Check if the current_user is admin or not and redirect to root url if not
+  #
   def require_admin!
-    redirect_to_root unless user_signed_in? && current_user.admin?
+    unless user_signed_in? && current_user.admin?
+      flash[:error] = "Sorry, you don't have permission to do that"
+      redirect_to_root
+    end
   end
   def redirect_to_root
@@ -30,4 +46,3 @@ protected
   end
 end
-
-class AppsController < InheritedResources::Base
+class AppsController < ApplicationController
+
+  include ProblemsSearcher
+
   before_filter :require_admin!, :except => [:index, :show]
   before_filter :parse_email_at_notices_or_set_default, :only => [:create, :update]
+  before_filter :parse_notice_at_notices_or_set_default, :only => [:create, :update]
   respond_to :html
-  def show
-    respond_to do |format|
-      format.html do
-        @all_errs = !!params[:all_errs]
+  expose(:app_scope) {
+    (current_user.admin? ? App : current_user.apps)
+  }
+
+  expose(:apps) {
+    app_scope.all.sort
+  }
+
+  expose(:app, :ancestor => :app_scope)
+
+  expose(:all_errs) {
+    !!params[:all_errs]
+  }
+  expose(:problems) {
+    if request.format == :atom
+      app.problems.unresolved.ordered
+    else
+      pr = app.problems
+      pr = pr.unresolved unless all_errs
+      pr.in_env(
+        params[:environment]
+      ).ordered_by(params_sort, params_order).page(params[:page]).per(current_user.per_page)
+    end
+  }
-        @sort  = params[:sort]
-        @order = params[:order]
-        @sort  = "last_notice_at" unless %w{message app last_deploy_at last_notice_at count}.member?(@sort)
-        @order = "desc" unless %w{asc desc}.member?(@order)
+  expose(:deploys) {
+    app.deploys.order_by(:created_at.desc).limit(5)
+  }
-        @problems = resource.problems
-        @problems = @problems.unresolved unless @all_errs
-        @problems = @problems.in_env(params[:environment]).ordered_by(@sort, @order).page(params[:page]).per(current_user.per_page)
+  def index; end
+  def show
+    app
+  end
-        @selected_problems = params[:problems] || []
-        @deploys = @app.deploys.order_by(:created_at.desc).limit(5)
-      end
-      format.atom do
-        @problems = resource.problems.unresolved.ordered
-      end
-    end
+  def new
+    plug_params(app)
   end
   def create
-    @app = App.new(params[:app])
     initialize_subclassed_issue_tracker
     initialize_subclassed_notification_service
-    create!
+    if app.save
+      redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.create.success') }
+    else
+      flash[:error] = I18n.t('controllers.apps.flash.create.error')
+      render :new
+    end
   end
   def update
-    @app = resource
     initialize_subclassed_issue_tracker
     initialize_subclassed_notification_service
-    update!
+    if app.save
+      redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.update.success') }
+    else
+      flash[:error] = I18n.t('controllers.apps.flash.update.error')
+      render :edit
+    end
   end
-  def new
-    plug_params(build_resource)
-    new!
+  def edit
+    plug_params(app)
   end
-  def edit
-    plug_params(resource)
-    edit!
+  def destroy
+    if app.destroy
+      redirect_to apps_url, :flash => { :success => I18n.t('controllers.apps.flash.destroy.success') }
+    else
+      flash[:error] = I18n.t('controllers.apps.flash.destroy.error')
+      render :show
+    end
   end
   protected
-    def collection
-      @apps ||= end_of_association_chain.all.sort
-    end
     def initialize_subclassed_issue_tracker
       # set the app's issue tracker
       if params[:app][:issue_tracker_attributes] && tracker_type = params[:app][:issue_tracker_attributes][:type]
         if IssueTracker.subclasses.map(&:name).concat(["IssueTracker"]).include?(tracker_type)
-          @app.issue_tracker = tracker_type.constantize.new(params[:app][:issue_tracker_attributes])
+          app.issue_tracker = tracker_type.constantize.new(params[:app][:issue_tracker_attributes])
         end
       end
     end
@@ -68,21 +95,11 @@ class AppsController &lt; InheritedResources::Base
       # set the app's notification service
       if params[:app][:notification_service_attributes] && notification_type = params[:app][:notification_service_attributes][:type]
         if NotificationService.subclasses.map(&:name).concat(["NotificationService"]).include?(notification_type)
-          @app.notification_service = notification_type.constantize.new(params[:app][:notification_service_attributes])
+          app.notification_service = notification_type.constantize.new(params[:app][:notification_service_attributes])
         end
       end
     end
-    def begin_of_association_chain
-      # Filter the @apps collection to apps watched by the current user, unless user is an admin.
-      # If user is an admin, then no filter is applied, and all apps are shown.
-      current_user unless current_user.admin?
-    end
-
-    def interpolation_options
-      {:app_name => resource.name}
-    end
-
     def plug_params app
       app.watchers.build if app.watchers.none?
       app.issue_tracker = IssueTracker.new unless app.issue_tracker_configured?
@@ -105,5 +122,20 @@ class AppsController &lt; InheritedResources::Base
         end
       end
     end
+
+    def parse_notice_at_notices_or_set_default
+      if params[:app][:notification_service_attributes] && val = params[:app][:notification_service_attributes][:notify_at_notices]
+        # Sanitize negative values, split on comma,
+        # strip, parse as integer, remove all '0's.
+        # If empty, set as default and show an error message.
+        notify_at_notices = val.gsub(/-\d+/,"").split(",").map{|v| v.strip.to_i }
+        if notify_at_notices.any?
+          params[:app][:notification_service_attributes][:notify_at_notices] = notify_at_notices
+        else
+          default_array = params[:app][:notification_service_attributes][:notify_at_notices] = Errbit::Config.notify_at_notices
+          flash[:error] = "Couldn't parse your notification frequency. Value was reset to default (#{default_array.join(', ')})."
+        end
+      end
+    end
 end
 class NoticesController < ApplicationController
-  respond_to :xml
+
+  class ParamsError < StandardError; end
   skip_before_filter :authenticate_user!, :only => :create
+  rescue_from ParamsError, :with => :bad_params
+
   def create
     # params[:data] if the notice came from a GET request, raw_post if it came via POST
-    notice = App.report_error!(params[:data] || request.raw_post)
-    api_xml = notice.to_xml(:only => false, :methods => [:id]) do |xml|
-      xml.url locate_url(notice.id, :host => Errbit::Config.host)
+    report = ErrorReport.new(notice_params)
+
+    if report.valid?
+      report.generate_notice!
+      api_xml = report.notice.to_xml(:only => false, :methods => [:id]) do |xml|
+        xml.url locate_url(report.notice.id, :host => Errbit::Config.host)
+      end
+      render :xml => api_xml
+    else
+      render :text => "Your API key is unknown", :status => 422
     end
-    render :xml => api_xml
   end
   # Redirects a notice to the problem page. Useful when using User Information at Airbrake gem.
@@ -17,4 +26,20 @@ class NoticesController &lt; ApplicationController
     problem = Notice.find(params[:id]).problem
     redirect_to app_problem_path(problem.app, problem)
   end
+
+  private
+
+  def notice_params
+    return @notice_params if @notice_params
+    @notice_params = params[:data] || request.raw_post
+    if @notice_params.blank?
+      raise ParamsError.new('Need a data params in GET or raw post data')
+    end
+    @notice_params
+  end
+
+  def bad_params(exception)
+    render :text => exception.message, :status => :bad_request
+  end
+
 end
+##
+# Manage problems
+#
+# List of actions available :
+# MEMBER => :show, :edit, :update, :create, :destroy, :resolve, :unresolve, :create_issue, :unlink_issue
+# COLLECTION => :index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several, :search
 class ProblemsController < ApplicationController
-  before_filter :find_app, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
-  before_filter :find_problem, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
-  before_filter :find_selected_problems, :only => [:destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
-  before_filter :set_sorting_params, :only => [:index, :all]
-  before_filter :set_tracker_params, :only => [:create_issue]
-  def index
-    app_scope = current_user.admin? ? App.all : current_user.apps
-    @problems = Problem.for_apps(app_scope).in_env(params[:environment]).unresolved.ordered_by(@sort, @order)
-    @selected_problems = params[:problems] || []
-    respond_to do |format|
-      format.html do
-        @problems = @problems.page(params[:page]).per(current_user.per_page)
-      end
-      format.atom
+  include ProblemsSearcher
+
+  before_filter :need_selected_problem, :only => [
+    :resolve_several, :unresolve_several, :unmerge_several
+  ]
+
+  expose(:app) {
+    if current_user.admin?
+      App.find(params[:app_id])
+    else
+      current_user.apps.find(params[:app_id])
     end
-  end
+  }
-  def all
-    app_scope = current_user.admin? ? App.all : current_user.apps
-    @problems = Problem.for_apps(app_scope).ordered_by(@sort, @order).page(params[:page]).per(current_user.per_page)
-    @selected_problems = params[:problems] || []
-  end
+  expose(:problem) {
+    app.problems.find(params[:id])
+  }
+
+
+  expose(:all_errs) {
+    params[:all_errs]
+  }
+
+  expose(:app_scope) {
+    apps = current_user.admin? ? App.all : current_user.apps
+    params[:app_id] ? apps.where(:_id => params[:app_id]) : apps
+  }
+
+  expose(:params_environement) {
+    params[:environment]
+  }
+
+  expose(:problems) {
+    pro = Problem.for_apps(
+      app_scope
+    ).in_env(
+      params_environement
+    ).all_else_unresolved(all_errs).ordered_by(params_sort, params_order)
+
+    if request.format == :html
+      pro.page(params[:page]).per(current_user.per_page)
+    else
+      pro
+    end
+  }
+
+  def index; end
   def show
-    @notices  = @problem.notices.reverse_ordered.page(params[:notice]).per(1)
+    @notices  = problem.notices.reverse_ordered.page(params[:notice]).per(1)
     @notice   = @notices.first
     @comment = Comment.new
-    if request.headers['X-PJAX']
-      params["_pjax"] = nil
-      render :layout => false
-    end
   end
   def create_issue
-    issue_creation = IssueCreation.new(@problem, current_user, params[:tracker])
+    IssueTracker.update_url_options(request)
+    issue_creation = IssueCreation.new(problem, current_user, params[:tracker])
     unless issue_creation.execute
-      flash[:error] = issue_creation.errors[:base].first
+      flash[:error] = issue_creation.errors.full_messages.join(', ')
     end
-    redirect_to app_problem_path(@app, @problem)
+    redirect_to app_problem_path(app, problem)
   end
   def unlink_issue
-    @problem.update_attribute :issue_link, nil
-    redirect_to app_problem_path(@app, @problem)
+    problem.update_attribute :issue_link, nil
+    redirect_to app_problem_path(app, problem)
   end
   def resolve
-    @problem.resolve!
+    problem.resolve!
     flash[:success] = 'Great news everyone! The err has been resolved.'
     redirect_to :back
   rescue ActionController::RedirectBackError
-    redirect_to app_path(@app)
+    redirect_to app_path(app)
   end
   def resolve_several
-    @selected_problems.each(&:resolve!)
-    flash[:success] = "Great news everyone! #{I18n.t(:n_errs_have, :count => @selected_problems.count)} been resolved."
+    selected_problems.each(&:resolve!)
+    flash[:success] = "Great news everyone! #{I18n.t(:n_errs_have, :count => selected_problems.count)} been resolved."
     redirect_to :back
   end
   def unresolve_several
-    @selected_problems.each(&:unresolve!)
-    flash[:success] = "#{I18n.t(:n_errs_have, :count => @selected_problems.count)} been unresolved."
+    selected_problems.each(&:unresolve!)
+    flash[:success] = "#{I18n.t(:n_errs_have, :count => selected_problems.count)} been unresolved."
     redirect_to :back
   end
+  ##
+  # Action to merge several Problem in One problem
+  #
+  # @param [ Array<String> ] :problems the list of problem ids
+  #
   def merge_several
-    if @selected_problems.length < 2
-      flash[:notice] = "You must select at least two errors to merge"
+    if selected_problems.length < 2
+      flash[:notice] = I18n.t('controllers.problems.flash.need_two_errors_merge')
     else
-      @merged_problem = Problem.merge!(@selected_problems)
-      flash[:notice] = "#{@selected_problems.count} errors have been merged."
+      ProblemMerge.new(selected_problems).merge
+      flash[:notice] = I18n.t('controllers.problems.flash.merge_several.success', :nb => selected_problems.count)
     end
     redirect_to :back
   end
   def unmerge_several
-    all = @selected_problems.map(&:unmerge!).flatten
+    all = selected_problems.map(&:unmerge!).flatten
     flash[:success] = "#{I18n.t(:n_errs_have, :count => all.length)} been unmerged."
     redirect_to :back
   end
   def destroy_several
-    nb_problem_destroy = ProblemDestroy.execute(@selected_problems)
+    nb_problem_destroy = ProblemDestroy.execute(selected_problems)
     flash[:notice] = "#{I18n.t(:n_errs_have, :count => nb_problem_destroy)} been deleted."
     redirect_to :back
   end
-  protected
-    def find_app
-      @app = App.find(params[:app_id])
-
-      # Mongoid Bug: could not chain: current_user.apps.find_by_id!
-      # apparently finding by 'watchers.email' and 'id' is broken
-      raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? || current_user.watching?(@app)
-    end
-
-    def find_problem
-      @problem = @app.problems.find(params[:id])
-    end
-
-    def set_tracker_params
-      IssueTracker.default_url_options[:host] = request.host
-      IssueTracker.default_url_options[:port] = request.port
-      IssueTracker.default_url_options[:protocol] = request.scheme
+  def search
+    ps = Problem.search(params[:search]).for_apps(app_scope).in_env(params[:environment]).all_else_unresolved(params[:all_errs]).ordered_by(params_sort, params_order)
+    selected_problems = params[:problems] || []
+    self.problems = ps.page(params[:page]).per(2)
+    respond_to do |format|
+      format.html { render :index }
+      format.js
     end
+  end
-    def find_selected_problems
-      err_ids = (params[:problems] || []).compact
-      if err_ids.empty?
-        flash[:notice] = "You have not selected any errors"
-        redirect_to :back
-      else
-        @selected_problems = Array(Problem.find(err_ids))
-      end
-    end
+  protected
-    def set_sorting_params
-      @sort = params[:sort]
-      @sort = "last_notice_at" unless %w{app message last_notice_at last_deploy_at count}.member?(@sort)
-      @order = params[:order] || "desc"
+  ##
+  # Redirect :back if no errors selected
+  #
+  def need_selected_problem
+    if err_ids.empty?
+      flash[:notice] = I18n.t('controllers.problems.flash.no_select_problem')
+      redirect_to :back
     end
+  end
 end
@@ -0,0 +1,34 @@
+# Include to do a Search
+# TODO: Need to be in a Dedicated Object ProblemsSearch with params like input
+#
+module ProblemsSearcher
+  extend ActiveSupport::Concern
+
+  included do
+
+    expose(:params_sort) {
+      unless %w{app message last_notice_at last_deploy_at count}.member?(params[:sort])
+        "last_notice_at"
+      else
+        params[:sort]
+      end
+    }
+
+    expose(:params_order){
+      unless %w{asc desc}.member?(params[:order])
+        'desc'
+      else
+        params[:order]
+      end
+    }
+
+    expose(:selected_problems) {
+      Array(Problem.find(err_ids))
+    }
+
+    expose(:err_ids) {
+      (params[:problems] || []).compact
+    }
+
+  end
+end
@@ -2,71 +2,76 @@ class UsersController &lt; ApplicationController
   respond_to :html
   before_filter :require_admin!, :except => [:edit, :update]
-  before_filter :find_user, :only => [:show, :edit, :update, :destroy, :unlink_github]
   before_filter :require_user_edit_priviledges, :only => [:edit, :update]
-  def index
-    @users = User.all.page(params[:page]).per(current_user.per_page)
-  end
+  expose(:user, :attributes => :user_params)
+  expose(:users) {
+    User.all.page(params[:page]).per(current_user.per_page)
+  }
-  def new
-    @user = User.new
-  end
+  def index; end
+  def new; end
+  def show; end
   def create
-    @user = User.new(params[:user])
-
-    # Set protected attributes
-    @user.admin = params[:user].try(:[], :admin) if current_user.admin?
-
-    if @user.save
-      flash[:success] = "#{@user.name} is now part of the team. Be sure to add them as a project watcher."
-      redirect_to user_path(@user)
+    if user.save
+      flash[:success] = "#{user.name} is now part of the team. Be sure to add them as a project watcher."
+      redirect_to user_path(user)
     else
       render :new
     end
   end
   def update
-    # Devise Hack
-    if params[:user][:password].blank? && params[:user][:password_confirmation].blank?
-      params[:user].delete(:password)
-      params[:user].delete(:password_confirmation)
-    end
-
-    # Set protected attributes
-    @user.admin = params[:user][:admin] if current_user.admin?
-
-    if @user.update_attributes(params[:user])
-      flash[:success] = "#{@user.name}'s information was successfully updated"
-      redirect_to user_path(@user)
+    if user.update_attributes(user_params)
+      flash[:success] = I18n.t('controllers.users.flash.update.success', :name => user.name)
+      redirect_to user_path(user)
     else
       render :edit
     end
   end
+  ##
+  # Destroy the user pass in args
+  #
+  # @param [ String ] id the id of user we want delete
+  #
   def destroy
-    @user.destroy
-
-    flash[:success] = "That's sad. #{@user.name} is no longer part of your team."
+    if user == current_user
+      flash[:error] = I18n.t('controllers.users.flash.destroy.error')
+    else
+      UserDestroy.new(user).destroy
+      flash[:success] = I18n.t('controllers.users.flash.destroy.success', :name => user.name)
+    end
     redirect_to users_path
   end
   def unlink_github
-    @user.update_attributes :github_login => nil, :github_oauth_token => nil
-    redirect_to user_path(@user)
+    user.update_attributes :github_login => nil, :github_oauth_token => nil
+    redirect_to user_path(user)
   end
   protected
-    def find_user
-      @user = User.find(params[:id])
-    end
-
     def require_user_edit_priviledges
-      can_edit = current_user == @user || current_user.admin?
+      can_edit = current_user == user || current_user.admin?
       redirect_to(root_path) and return(false) unless can_edit
     end
+  def user_params
+    @user_params ||= params[:user] ? params.require(:user).permit(*user_permit_params) : {}
+  end
+
+  def user_permit_params
+    @user_permit_params ||= [:name,:username, :email, :github_login, :per_page, :time_zone]
+    @user_permit_params << :admin if current_user.admin? && current_user.id != params[:id]
+    @user_permit_params |= [:password, :password_confirmation] if user_password_params.values.all?{|pa| !pa.blank? }
+    @user_permit_params
+  end
+
+  def user_password_params
+    @user_password_params ||= params[:user] ? params.require(:user).permit(:password, :password_confirmation) : {}
+  end
+
 end
@@ -8,11 +8,11 @@ module ApplicationHelper
       notices.each_with_index do |notice,idx|
         cal.event do |event|
           event.summary     = "#{idx+1} #{notice.message.to_s}"
-          event.description = notice.request['url']
+          event.description = notice.url if notice.url
           event.dtstart     = notice.created_at.utc
           event.dtend       = notice.created_at.utc + 60.minutes
           event.organizer   = notice.server_environment && notice.server_environment["hostname"]
-          event.location    = notice.server_environment && notice.server_environment["project-root"]
+          event.location    = notice.project_root
           event.url         = app_problem_url(:app_id => notice.problem.app.id, :id => notice.problem)
         end
       end
@@ -57,7 +57,7 @@ module ApplicationHelper
     total   = (options[:total] || total_from_tallies(tallies))
     percent = 100.0 / total.to_f
     rows    = tallies.map {|value, count| [(count.to_f * percent), value]} \
-                     .sort {|a, b| a[0] <=> b[0]}
+                     .sort {|a, b| b[0] <=> a[0]}
     render "problems/tally_table", :rows => rows
   end
@@ -4,7 +4,7 @@ module AppsHelper
       html =  link_to('copy settings from another app', '#',
                        :class => 'button copy_config')
       html << select("duplicate", "app",
-                     App.all.reject{|a| a == @app }.
+                     App.all.asc(:name).reject{|a| a == @app }.
                      collect{|p| [ p.name, p.id ] }, {:include_blank => "[choose app]"},
                      {:class => "choose_other_app", :style => "display: none;"})
       return html
@@ -41,7 +41,7 @@ module AppsHelper
   def detect_any_apps_with_attributes
     @any_github_repos = @any_issue_trackers = @any_deploys = @any_bitbucket_repos = @any_notification_services = false
-    @apps.each do |app|
+    apps.each do |app|
       @any_github_repos   ||= app.github_repo?
       @any_bitbucket_repos   ||= app.bitbucket_repo?
       @any_issue_trackers ||= app.issue_tracker_configured?
 module BacktraceLineHelper
   def link_to_source_file(line, &block)
     text = capture_haml(&block)
-    line.in_app? ? link_to_in_app_source_file(line, text) : link_to_external_source_file(text)
+     link_to_in_app_source_file(line, text) || link_to_external_source_file(text)
   end
   private
   def link_to_in_app_source_file(line, text)
-    link_to_repo_source_file(line, text) || link_to_issue_tracker_file(line, text)
+    return unless line.in_app?
+    if line.file_name =~ /\.js$/
+      link_to_hosted_javascript(line, text)
+    else
+      link_to_repo_source_file(line, text) ||
+      link_to_issue_tracker_file(line, text)
+    end
   end
   def link_to_repo_source_file(line, text)
     link_to_github(line, text) || link_to_bitbucket(line, text)
   end
+  def link_to_hosted_javascript(line, text)
+    if line.app.asset_host?
+      link_to(text, "#{line.app.asset_host}/#{line.file_relative}", :target => '_blank')
+    end
+  end
+
   def link_to_external_source_file(text)
     text
   end
@@ -31,7 +43,7 @@ module BacktraceLineHelper
   def link_to_issue_tracker_file(line, text = nil)
     return unless line.app.issue_tracker && line.app.issue_tracker.respond_to?(:url_to_file)
-    href = line.app.issue_tracker.url_to_file(line.file, line.number)
+    href = line.app.issue_tracker.url_to_file(line.file_relative, line.number)
     link_to(text || line.file_name, href, :target => '_blank')
   end
@@ -11,17 +11,22 @@ module ProblemsHelper
   end
   def gravatar_tag(email, options = {})
+    return nil unless email.present?
+
     image_tag gravatar_url(email, options), :alt => email, :class => 'gravatar'
   end
   def gravatar_url(email, options = {})
+    return nil unless email.present?
+
     default_options = {
       :d => Errbit::Config.gravatar_default,
     }
     options.reverse_merge! default_options
     params = options.extract!(:s, :d).delete_if { |k, v| v.blank? }
     email_hash = Digest::MD5.hexdigest(email)
-    "http://www.gravatar.com/avatar/#{email_hash}?#{params.to_query}"
+    url = request.ssl? ? "https://secure.gravatar.com" : "http://www.gravatar.com"
+    "#{url}/avatar/#{email_hash}?#{params.to_query}"
   end
 end
 # encoding: utf-8
 module SortHelper
-  
+
   def link_for_sort(name, field=nil)
     field ||= name.underscore
-    current = (@sort == field)
-    order   = (current && (@order == "asc")) ? "desc" : "asc"
+    current = (params_sort == field)
+    order   = (current && (params_order == "asc")) ? "desc" : "asc"
     url     = request.path + "?sort=#{field}&order=#{order}"
     options = {}
     options.merge!(:class => "current #{order}") if current
     link_to(name, url, options)
   end
-  
+
 end
@@ -41,15 +41,11 @@ class IssueCreation
   end
   def execute
-    if tracker
-      begin
-        tracker.create_issue problem, user
-      rescue => ex
-        Rails.logger.error "Error during issue creation: " << ex.message
-        errors.add :base, "There was an error during issue creation: #{ex.message}"
-      end
-    end
-
+    tracker.create_issue problem, user if tracker
     errors.empty?
+  rescue => ex
+    Rails.logger.error "Error during issue creation: " << ex.message
+    errors.add :base, "There was an error during issue creation: #{ex.message}"
+    false
   end
 end
@@ -37,12 +37,12 @@ class ProblemDestroy
   end
   def delete_errs
-    Err.collection.remove(:_id => { '$in' => errs_id })
-    Notice.collection.remove(:err_id => { '$in' => errs_id })
+    Notice.delete_all(:err_id => { '$in' => errs_id })
+    Err.delete_all(:_id => { '$in' => errs_id })
   end
   def delete_comments
-    Comment.collection.remove(:_id => { '$in' => comments_id })
+    Comment.delete_all(:_id => { '$in' => comments_id })
   end
 end
@@ -0,0 +1,28 @@
+require 'problem_destroy'
+
+class ProblemMerge
+  def initialize(*problems)
+    problems = problems.flatten.uniq
+    @merged_problem = problems[0]
+    @child_problems = problems[1..-1]
+    raise ArgumentError.new("need almost 2 uniq different problems") if @child_problems.empty?
+  end
+  attr_reader :merged_problem, :child_problems
+
+  def merge
+    child_problems.each do |problem|
+      merged_problem.errs.concat problem.errs
+      merged_problem.comments.concat problem.comments
+      problem.reload # deference all associate objet to avoid delete him after
+      ProblemDestroy.execute(problem)
+    end
+    reset_cached_attributes
+    merged_problem
+  end
+
+  private
+
+  def reset_cached_attributes
+    ProblemUpdaterCache.new(merged_problem).update
+  end
+end
@@ -0,0 +1,88 @@
+class ProblemUpdaterCache
+  def initialize(problem, notice=nil)
+    @problem = problem
+    @notice = notice
+  end
+  attr_reader :problem
+
+  ##
+  # Update cache information about child associate to this problem
+  #
+  # update the notices count, and some notice informations
+  #
+  # @return [ Problem ] the problem with this update
+  #
+  def update
+    update_notices_count
+    update_notices_cache
+    problem
+  end
+
+  private
+
+  def update_notices_count
+    if @notice
+      problem.inc(:notices_count, 1)
+    else
+      problem.update_attribute(
+        :notices_count, problem.notices.count
+      )
+    end
+  end
+
+  ##
+  # Update problem statistique from some notice information
+  #
+  def update_notices_cache
+    first_notice = notices.first
+    last_notice = notices.last
+    notice ||= @notice || first_notice
+
+    attrs = {}
+    attrs[:first_notice_at] = first_notice.created_at if first_notice
+    attrs[:last_notice_at] = last_notice.created_at if last_notice
+    attrs.merge!(
+      :message     => notice.message,
+      :where       => notice.where,
+      :messages    => attribute_count(:message, messages),
+      :hosts       => attribute_count(:host, hosts),
+      :user_agents => attribute_count(:user_agent_string, user_agents)
+    ) if notice
+    problem.update_attributes!(attrs)
+  end
+
+  def notices
+    @notices ||= @notice ? [@notice].sort(&:created_at) : problem.notices.order_by([:created_at, :asc])
+  end
+
+  def messages
+    @notice ? problem.messages : {}
+  end
+
+  def hosts
+    @notice ? problem.hosts : {}
+  end
+
+  def user_agents
+    @notice ? problem.user_agents : {}
+  end
+
+  private
+
+    def attribute_count(value, init)
+      init.tap do |counts|
+        notices.each do |notice|
+          counts[attribute_index(notice.send(value))] ||= {
+            'value' => notice.send(value),
+            'count' => 0
+          }
+          counts[attribute_index(notice.send(value))]['count'] += 1
+        end
+      end
+    end
+
+    def attribute_index(value)
+      @attributes_index ||= {}
+      @attributes_index[value.to_s] ||= Digest::MD5.hexdigest(value.to_s)
+    end
+end
@@ -0,0 +1,32 @@
+require 'problem_destroy'
+
+class ResolvedProblemClearer
+
+  ##
+  # Clear all problem already resolved
+  #
+  def execute
+    nb_problem_resolved.tap { |nb|
+      if nb > 0
+        criteria.each do |problem|
+          ProblemDestroy.new(problem).execute
+        end
+        repair_database
+      end
+    }
+  end
+
+  private
+
+  def nb_problem_resolved
+    @count ||= criteria.count
+  end
+
+  def criteria
+    @criteria = Problem.resolved
+  end
+
+  def repair_database
+    Mongoid.default_session.command :repairDatabase => 1
+  end
+end
@@ -0,0 +1,11 @@
+class UserDestroy
+  def initialize(user)
+    @user = user
+  end
+
+  def destroy
+    @user.destroy
+    @user.watchers.each(&:destroy)
+  end
+
+end
@@ -3,14 +3,20 @@
 require Rails.root.join('config/routes.rb')
 class Mailer < ActionMailer::Base
+  helper ApplicationHelper
+  helper BacktraceLineHelper
+
   default :from => Errbit::Config.email_from
   def err_notification(notice)
     @notice   = notice
     @app      = notice.app
+    count = @notice.similar_count
+    count = count > 1 ? "(#{count}) " : ""
+
     mail :to      => @app.notification_recipients,
-         :subject => "[#{@app.name}][#{@notice.environment_name}] #{@notice.message}"
+         :subject => "#{count}[#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
   end
   def deploy_notification(deploy)
@@ -20,5 +26,17 @@ class Mailer &lt; ActionMailer::Base
     mail :to       => @app.notification_recipients,
          :subject  => "[#{@app.name}] Deployed to #{@deploy.environment} by #{@deploy.username}"
   end
-end
+  def comment_notification(comment)
+    @comment  = comment
+    @user     = comment.user
+    @problem  = comment.err
+    @notice   = @problem.notices.first
+    @app      = @problem.app
+
+    recipients = @comment.notification_recipients
+
+    mail :to      => recipients,
+         :subject => "#{@user.name} commented on [#{@app.name}][#{@notice.environment_name}] #{@notice.message.truncate(50)}"
+  end
+end
 class App
+  include Comparable
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Comparable
   field :name, :type => String
   field :api_key
   field :github_repo
   field :bitbucket_repo
+  field :asset_host
   field :repository_branch
   field :resolve_errs_on_deploy, :type => Boolean, :default => false
   field :notify_all_users, :type => Boolean, :default => false
@@ -15,7 +16,12 @@ class App
   field :email_at_notices, :type => Array, :default => Errbit::Config.email_at_notices
   # Some legacy apps may have string as key instead of BSON::ObjectID
-  identity :type => String
+  # identity :type => String
+  field :_id,
+    type: String,
+    pre_processed: true,
+    default: ->{ Moped::BSON::ObjectId.new.to_s }
+
   embeds_many :watchers
   embeds_many :deploys
@@ -41,46 +47,17 @@ class App
   accepts_nested_attributes_for :notification_service, :allow_destroy => true,
     :reject_if => proc { |attrs| !NotificationService.subclasses.map(&:to_s).include?(attrs[:type].to_s) }
-  # Processes a new error report.
-  #
-  # Accepts either XML or a hash with the following attributes:
-  #
-  # * <tt>:error_class</tt> - the class of error
-  # * <tt>:message</tt> - the error message
-  # * <tt>:backtrace</tt> - an array of stack trace lines
-  #
-  # * <tt>:request</tt> - a hash of values describing the request
-  # * <tt>:server_environment</tt> - a hash of values describing the server environment
-  #
-  # * <tt>:api_key</tt> - the API key with which the error was reported
-  # * <tt>:notifier</tt> - information to identify the source of the error report
-  #
-  def self.report_error!(*args)
-    report = ErrorReport.new(*args)
-    report.generate_notice!
-  end
-
-
-  # Processes a new error report.
-  #
-  # Accepts a hash with the following attributes:
+  # Acceps a hash with the following attributes:
   #
-  # * <tt>:error_class</tt> - the class of error
-  # * <tt>:message</tt> - the error message
-  # * <tt>:backtrace</tt> - an array of stack trace lines
+  # * <tt>:error_class</tt> - the class of error (required to create a new Problem)
+  # * <tt>:environment</tt> - the environment the source app was running in (required to create a new Problem)
+  # * <tt>:fingerprint</tt> - a unique value identifying the notice
   #
-  # * <tt>:request</tt> - a hash of values describing the request
-  # * <tt>:server_environment</tt> - a hash of values describing the server environment
-  #
-  # * <tt>:notifier</tt> - information to identify the source of the error report
-  #
-  def report_error!(hash)
-    report = ErrorReport.new(hash.merge(:api_key => api_key))
-    report.generate_notice!
-  end
-
   def find_or_create_err!(attrs)
-    Err.where(:fingerprint => attrs[:fingerprint]).first || problems.create!.errs.create!(attrs)
+    Err.where(
+      :fingerprint => attrs[:fingerprint]
+    ).first ||
+      problems.create!(attrs.slice(:error_class, :environment)).errs.create!(attrs.slice(:fingerprint, :problem_id))
   end
   # Mongoid Bug: find(id) on association proxies returns an Enumerator
@@ -89,7 +66,7 @@ class App
   end
   def self.find_by_api_key!(key)
-    where(:api_key => key).first || raise(Mongoid::Errors::DocumentNotFound.new(self,key))
+    find_by(:api_key => key)
   end
   def last_deploy_at
@@ -103,7 +80,7 @@ class App
   end
   alias :notify_on_errs? :notify_on_errs
-  def notifiable?
+  def emailable?
     notify_on_errs? && notification_recipients.any?
   end
@@ -125,7 +102,7 @@ class App
   end
   def github_url_to_file(file)
-    "#{github_url}/blob/#{repo_branch + file}"
+    "#{github_url}/blob/#{repo_branch}/#{file}"
   end
   def bitbucket_repo?
@@ -137,7 +114,7 @@ class App
   end
   def bitbucket_url_to_file(file)
-    "#{bitbucket_url}/src/#{repo_branch + file}"
+    "#{bitbucket_url}/src/#{repo_branch}/#{file}"
   end
@@ -3,7 +3,7 @@ class Backtrace
   include Mongoid::Timestamps
   field :fingerprint
-  index :fingerprint
+  index :fingerprint => 1
   has_many :notices
   has_one :notice
@@ -19,11 +19,11 @@ class Backtrace
   end
   def similar
-    Backtrace.first(:conditions => { :fingerprint => fingerprint } )
+    Backtrace.find_by(:fingerprint => fingerprint) rescue nil
   end
   def raw=(raw)
-    raw.each do |raw_line|
+    raw.compact.each do |raw_line|
       lines << BacktraceLine.new(BacktraceLineNormalizer.new(raw_line).call)
     end
   end
 class BacktraceLine
   include Mongoid::Document
-  IN_APP_PATH = %r{^\[PROJECT_ROOT\]\/(?!(vendor))}
+  IN_APP_PATH = %r{^\[PROJECT_ROOT\](?!(\/vendor))/?}
   GEMS_PATH   = %r{\[GEM_ROOT\]\/gems\/([^\/]+)}
   field :number, :type => Integer
+  field :column, :type => Integer
   field :file
   field :method
@@ -14,7 +15,7 @@ class BacktraceLine
   delegate :app, :to => :backtrace
   def to_s
-    "#{file}:#{number}"
+    "#{file_relative}:#{number}" << (column.present? ? ":#{column}" : "")
   end
   def in_app?
 class BacktraceLineNormalizer
   def initialize(raw_line)
-    @raw_line = raw_line
+    @raw_line = raw_line || {}
   end
   def call
@@ -9,11 +9,24 @@ class BacktraceLineNormalizer
   private
   def normalized_file
-    @raw_line['file'].blank? ? "[unknown source]" :  @raw_line['file'].to_s.gsub(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
+    if @raw_line['file'].blank?
+      "[unknown source]"
+    else
+      file = @raw_line['file'].to_s
+      # Detect lines from gem
+      file.gsub!(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
+      # Strip any query strings
+      file.gsub!(/\?[^\?]*$/, '')
+      @raw_line['file'] = file
+    end
   end
   def normalized_method
-    @raw_line['method'].gsub(/[0-9_]{10,}+/, "__FRAGMENT__")
+    if @raw_line['method'].blank?
+      "[unknown method]"
+    else
+      @raw_line['method'].to_s.gsub(/[0-9_]{10,}+/, "__FRAGMENT__")
+    end
   end
 end
@@ -6,13 +6,22 @@ class Comment
   before_destroy :decrease_counter_cache
   field :body, :type => String
-  index :user_id
+  index(:user_id => 1)
   belongs_to :err, :class_name => "Problem"
   belongs_to :user
+  delegate   :app, :to => :err
   validates_presence_of :body
+  def notification_recipients
+    app.notification_recipients - [user.email]
+  end
+
+  def emailable?
+    app.emailable? && notification_recipients.any?
+  end
+
   protected
     def increase_counter_cache
       err.inc(:comments_count, 1)
@@ -23,4 +32,3 @@ class Comment
     end
 end
-
@@ -0,0 +1,8 @@
+class CommentObserver < Mongoid::Observer
+  observe :comment
+
+  def after_create(comment)
+    Mailer.comment_notification(comment).deliver if comment.emailable?
+  end
+
+end
@@ -8,7 +8,7 @@ class Deploy
   field :revision
   field :message
-  index :created_at, Mongo::DESCENDING
+  index(:created_at => -1)
   embedded_in :app, :inverse_of => :deploys
@@ -6,20 +6,16 @@ class Err
   include Mongoid::Document
   include Mongoid::Timestamps
-  field :error_class, :default => "UnknownError"
-  field :component
-  field :action
-  field :environment, :default => "unknown"
   field :fingerprint
-  belongs_to :problem
-  index :problem_id
-  index :error_class
-  index :fingerprint
+  index problem_id: 1
+  index fingerprint: 1
+  belongs_to :problem
   has_many :notices, :inverse_of => :err, :dependent => :destroy
+  validates_presence_of :problem_id, :fingerprint
+
   delegate :app, :resolved?, :to => :problem
 end
-
-require 'digest/sha1'
 require 'hoptoad_notifier'
+##
+# Processes a new error report.
+#
+# Accepts a hash with the following attributes:
+#
+# * <tt>:error_class</tt> - the class of error
+# * <tt>:message</tt> - the error message
+# * <tt>:backtrace</tt> - an array of stack trace lines
+#
+# * <tt>:request</tt> - a hash of values describing the request
+# * <tt>:server_environment</tt> - a hash of values describing the server environment
+#
+# * <tt>:notifier</tt> - information to identify the source of the error report
+#
 class ErrorReport
-  attr_reader :error_class, :message, :request, :server_environment, :api_key, :notifier, :user_attributes, :current_user
+  attr_reader :error_class, :message, :request, :server_environment, :api_key, :notifier, :user_attributes, :framework
   def initialize(xml_or_attributes)
     @attributes = (xml_or_attributes.is_a?(String) ? Hoptoad.parse_xml!(xml_or_attributes) : xml_or_attributes).with_indifferent_access
     @attributes.each{|k, v| instance_variable_set(:"@#{k}", v) }
   end
-  def fingerprint
-    @fingerprint ||= Digest::SHA1.hexdigest(fingerprint_source.to_s)
-  end
-
   def rails_env
-    server_environment['environment-name'] || 'development'
-  end
-
-  def component
-    request['component'] || 'unknown'
-  end
-
-  def action
-    request['action']
+    rails_env = server_environment['environment-name']
+    rails_env = 'development' if rails_env.blank?
+    rails_env
   end
   def app
-    @app ||= App.find_by_api_key!(api_key)
+    @app ||= App.where(:api_key => api_key).first
   end
   def backtrace
@@ -34,7 +37,9 @@ class ErrorReport
   end
   def generate_notice!
-    notice = Notice.new(
+    return unless valid?
+    return @notice if @notice
+    @notice = Notice.new(
       :message => message,
       :error_class => error_class,
       :backtrace_id => backtrace.id,
@@ -42,31 +47,35 @@ class ErrorReport
       :server_environment => server_environment,
       :notifier => notifier,
       :user_attributes => user_attributes,
-      :current_user => current_user
+      :framework => framework
     )
+    error.notices << @notice
+    @notice
+  end
+  attr_reader :notice
-    err = app.find_or_create_err!(
+  ##
+  # Error associate to this error_report
+  #
+  # Can already exist or not
+  #
+  # @return [ Error ]
+  def error
+    @error ||= app.find_or_create_err!(
       :error_class => error_class,
-      :component => component,
-      :action => action,
       :environment => rails_env,
-      :fingerprint => fingerprint)
+      :fingerprint => fingerprint
+    )
+  end
-    err.notices << notice
-    notice
+  def valid?
+    !!app
   end
   private
-  def fingerprint_source
-    {
-      :backtrace => backtrace.id,
-      :error_class => error_class,
-      :component => component,
-      :action => action,
-      :environment => rails_env,
-      :api_key => api_key
-    }
+
+  def fingerprint
+    @fingerprint ||= Fingerprint.generate(notice, api_key)
   end
 end
-
@@ -0,0 +1,41 @@
+require 'digest/sha1'
+
+class Fingerprint
+  attr_reader :notice, :api_key
+  
+  def self.generate(notice, api_key)
+    self.new(notice, api_key).to_s
+  end
+  
+  def initialize(notice, api_key)
+    @notice = notice
+    @api_key = api_key
+  end
+  
+  
+  
+  def to_s
+    Digest::SHA1.hexdigest(fingerprint_source.to_s)
+  end
+  
+  def fingerprint_source
+    # Find the first backtrace line with a file and line number.
+    if line = notice.backtrace.lines.detect {|l| l.number.present? && l.file.present? }
+      # If line exists, only use file and number.
+      file_or_message = "#{line.file}:#{line.number}"
+    else
+      # If no backtrace, use error message
+      file_or_message = notice.message
+    end
+
+    {
+      :file_or_message => file_or_message,
+      :error_class => notice.error_class,
+      :component => notice.component || 'unknown',
+      :action => notice.action,
+      :environment => notice.environment_name || 'development',
+      :api_key => api_key
+    }
+  end
+  
+end
@@ -15,6 +15,15 @@ class IssueTracker
   field :password, :type => String
   field :ticket_properties, :type => String
   field :subdomain, :type => String
+  field :milestone_id, :type => String
+
+  # Is there any better way to enhance the props? Putting them into the subclass leads to
+  # an error while rendering the form fields -.-
+  field :base_url, :type => String
+  field :context_path, :type => String
+  field :issue_type, :type => String
+  field :issue_component, :type => String
+  field :issue_priority, :type => String
   validate :check_params
@@ -39,5 +48,15 @@ class IssueTracker
   def configured?
     project_id.present?
   end
-end
+  ##
+  # Update default_url_option with valid data from the request information
+  #
+  # @param [ Request ] a request with host, port and protocol
+  #
+  def self.update_url_options(request)
+    IssueTracker.default_url_options[:host] = request.host
+    IssueTracker.default_url_options[:port] = request.port
+    IssueTracker.default_url_options[:protocol] = request.scheme
+  end
+end
-class IssueTrackers::BitbucketIssuesTracker < IssueTracker
-  Label = "bitbucket"
-  Note = 'Please configure your Bitbucket repository in the <strong>BITBUCKET REPO</strong> field above.'
-  Fields = [
-    [:api_token, {
-      :placeholder => "Your username on Bitbucket account",
-      :label => "Username"
-    }],
-    [:project_id, {
-      :placeholder => "Password for your Bitbucket account",
-      :label => "Password"
-    }]
-  ]
+begin
+  require 'bitbucket_rest_api'
+rescue LoadError
+end
+
+if defined? BitBucket
+  class IssueTrackers::BitbucketIssuesTracker < IssueTracker
+    Label = "bitbucket"
+    Note = 'Please configure your Bitbucket repository in the <strong>BITBUCKET REPO</strong> field above.'
+    Fields = [
+      [:api_token, {
+        :placeholder => "Your username on Bitbucket account",
+        :label => "Username"
+      }],
+      [:project_id, {
+        :placeholder => "Password for your Bitbucket account",
+        :label => "Password"
+      }]
+    ]
-  def check_params
-    if Fields.detect {|f| self[f[0]].blank? }
-      errors.add :base, 'You must specify your Bitbucket username and password'
+    def check_params
+      if Fields.detect {|f| self[f[0]].blank? }
+        errors.add :base, 'You must specify your Bitbucket username and password'
+      end
     end
-  end
-  def repo_name
-    app.bitbucket_repo
-  end
+    def repo_name
+      app.bitbucket_repo
+    end
-  def create_issue(problem, reported_by = nil)
-    bitbucket = BitBucket.new :basic_auth => "#{api_token}:#{project_id}"
+    def create_issue(problem, reported_by = nil)
+      bitbucket = BitBucket.new :basic_auth => "#{api_token}:#{project_id}"
-    begin
-      issue = bitbucket.issues.create api_token, repo_name.split('/')[1], :title => issue_title(problem), :content => body_template.result(binding), :priority => 'critical'
-      problem.update_attributes(
-        :issue_link => "https://bitbucket.org/#{repo_name}/issue/#{issue.local_id}/",
-        :issue_type => Label
-      )
-    rescue BitBucket::Error::Unauthorized
-      raise IssueTrackers::AuthenticationError, "Could not authenticate with BitBucket. Please check your username and password."
+      begin
+        r_user = repo_name.split('/')[0]
+        r_name = repo_name.split('/')[1]
+        issue = bitbucket.issues.create r_user, r_name, :title => issue_title(problem), :content => body_template.result(binding), :priority => 'critical'
+        problem.update_attributes(
+          :issue_link => "https://bitbucket.org/#{repo_name}/issue/#{issue.local_id}/",
+          :issue_type => Label
+        )
+      rescue BitBucket::Error::Unauthorized
+        raise IssueTrackers::AuthenticationError, "Could not authenticate with BitBucket. Please check your username and password."
+      end
     end
-  end
-  def body_template
-    @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/bitbucket_issues_body.txt.erb"))
-  end
+    def body_template
+      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/bitbucket_issues_body.txt.erb"))
+    end
-  def url
-    "https://www.bitbucket.org/#{repo_name}/issues"
+    def url
+      "https://www.bitbucket.org/#{repo_name}/issues"
+    end
   end
 end
-
@@ -10,7 +10,7 @@ if defined? Gitlab
         :placeholder => "API Token for your account"
       }],
       [:project_id, {
-        :label       => "Ticket Project Short Name / ID",
+        :label       => "Ticket Project ID (use Number)",
         :placeholder => "Gitlab Project where issues will be created"
       }]
     ]
@@ -23,19 +23,25 @@ if defined? Gitlab
     def create_issue(problem, reported_by = nil)
       Gitlab.configure do |config|
-        config.endpoint = "#{account}/api/v2"
+        config.endpoint = "#{account}/api/v3"
         config.private_token = api_token
         config.user_agent = 'Errbit User Agent'
       end
       title = issue_title problem
-      description = body_template.result(binding)
-      Gitlab.create_issue(project_id, title, { :description => description, :labels => "errbit" } )
+      description_summary = summary_template.result(binding)
+      description_body = body_template.result(binding)
+      ticket = Gitlab.create_issue(project_id, title, { :description => description_summary, :labels => "errbit" } )
+      Gitlab.create_issue_note(project_id, ticket.id, description_body)
+    end
+
+    def summary_template
+      @@summary_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/gitlab_summary.txt.erb").gsub(/^\s*/, ''))
     end
     def body_template
       @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/gitlab_body.txt.erb").gsub(/^\s*/, ''))
     end
-    
+
     def url
       "#{account}/#{project_id}/issues"
     end
@@ -0,0 +1,110 @@
+if defined? JIRA
+  class IssueTrackers::JiraTracker < IssueTracker
+    Label = 'jira'
+
+    Fields = [
+        [:base_url, {
+            :label => 'Jira URL without trailing slash',
+            :placeholder => 'https://jira.example.org/'
+        }],
+        [:context_path, {
+            :optional => true,
+            :label => 'Context Path (Just "/" if empty otherwise with leading slash)',
+            :placeholder => "/jira"
+        }],
+        [:username, {
+            :optional => true,
+            :label => 'HTTP Basic Auth User',
+            :placeholder => 'johndoe'
+        }],
+        [:password, {
+            :optional => true,
+            :label => 'HTTP Basic Auth Password',
+            :placeholder => 'p@assW0rd'
+        }],
+        [:project_id, {
+            :label => 'Project Key',
+            :placeholder => 'The project Key where the issue will be created'
+        }],
+        [:account, {
+            :optional => true,
+            :label => 'Assign to this user. If empty, Jira takes the project default.',
+            :placeholder => "username"
+        }],
+        [:issue_component, {
+            :label => 'Issue category',
+            :placeholder => 'Website - Other'
+        }],
+        [:issue_type, {
+            :label => 'Issue type',
+            :placeholder => 'Bug'
+        }],
+        [:issue_priority, {
+            :label => 'Priority',
+            :placeholder => 'Normal'
+        }]
+    ]
+
+    def check_params
+      if Fields.detect { |f| self[f[0]].blank? && !f[1][:optional] }
+        errors.add :base, 'You must specify all non optional values!'
+      end
+    end
+
+
+    #
+    # @param problem Problem
+    def create_issue(problem, reported_by = nil)
+      options = {
+          :username => username,
+          :password => password,
+          :site => base_url,
+          :context_path => context_path,
+          :auth_type => :basic,
+          :use_ssl => base_url.match(/^https/) ? true : false
+      }
+      client = JIRA::Client.new(options)
+
+      issue = {
+          :fields => {
+              :project => {
+                  :key => project_id
+              },
+              :summary => issue_title(problem),
+              :description => body_template.result(binding),
+              :issuetype => {
+                  :name => issue_type
+              },
+              :priority => {
+                  :name => issue_priority,
+              },
+
+              :components => [{:name => issue_component}]
+          }
+      }
+
+      issue[:fields][:assignee] = {:name => account} if account
+
+      issue_build = client.Issue.build
+      issue_build.save(issue)
+      issue_build.fetch
+
+      problem.update_attributes(
+          :issue_link => "#{base_url}#{context_path}browse/#{issue_build.key}",
+          :issue_type => Label
+      )
+
+      # Maybe in a later version?
+      #remote_link = {
+      #    :url => app_problem_url(problem.app, problem),
+      #    :name => "Link to Errbit Issue"
+      #}
+      #remote_link_build = issue_build.remotelink.build
+      #remote_link_build.save(remote_link)
+    end
+
+    def body_template
+      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/jira_body.txt.erb"))
+    end
+  end
+end
 \ No newline at end of file
@@ -9,6 +9,12 @@ if defined? RedmineClient
       [:api_token, {
         :placeholder => "API Token for your account"
       }],
+      [:username, {
+        :placeholder => "Your username"
+      }],
+      [:password, {
+        :placeholder => "Your password"
+      }],
       [:project_id, {
         :label       => "Ticket Project",
         :placeholder => "Redmine Project where tickets will be created"
@@ -22,15 +28,19 @@ if defined? RedmineClient
     def check_params
       if Fields.detect {|f| self[f[0]].blank? && !f[1][:optional]}
-        errors.add :base, 'You must specify your Redmine URL, API token and Project ID'
+        errors.add :base, 'You must specify your Redmine URL, API token, Username, Password and Project ID'
       end
     end
     def create_issue(problem, reported_by = nil)
       token = api_token
       acc = account
+      user = username
+      passwd = password
       RedmineClient::Base.configure do
         self.token = token
+        self.user = user
+        self.password = passwd
         self.site = acc
         self.format = :xml
       end
@@ -47,17 +57,18 @@ if defined? RedmineClient
     def url_to_file(file_path, line_number = nil)
       # alt_project_id let's users specify a different project for tickets / app files.
       project = self.alt_project_id.present? ? self.alt_project_id : self.project_id
-      url = "#{self.account}/projects/#{project}/repository/annotate/#{file_path.sub(/^\//,'')}"
+      url = "#{self.account.gsub(/\/$/, '')}/projects/#{project}/repository/revisions/#{app.repository_branch}/changes/#{file_path.sub(/\[PROJECT_ROOT\]/, '').sub(/^\//,'')}"
       line_number ? url << "#L#{line_number}" : url
     end
     def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/textile_body.txt.erb"))
+      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/redmine_body.txt.erb"))
     end
     def url
       acc_url = account.start_with?('http') ? account : "http://#{account}"
-      URI.parse("#{acc_url}?project_id=#{project_id}").to_s
+      acc_url = acc_url.gsub(/\/$/, '')
+      URI.parse("#{acc_url}/projects/#{project_id}").to_s
     rescue URI::InvalidURIError
     end
   end
@@ -0,0 +1,69 @@
+class IssueTrackers::UnfuddleTracker < IssueTracker
+  Label = "unfuddle"
+  Fields = [
+
+            [:account, {
+               :placeholder => "Your domain"
+             }],
+
+
+            [:username, {
+               :placeholder => "Your username"
+             }],
+
+            [:password, {
+               :placeholder => "Your password"
+             }],
+
+            [:project_id, {
+               :label       => "Ticket Project",
+               :placeholder => "Project where tickets will be created"
+             }],
+
+            [:milestone_id, {
+               :optional    => true,
+               :label       => "Ticket Milestone",
+               :placeholder => "Milestone where tickets will be created"
+             }]
+
+
+           ]
+
+  def check_params
+    if Fields.detect {|f| self[f[0]].blank? && !f[1][:optional]}
+      errors.add :base, 'You must specify your Account, Username, Password and Project ID'
+    end
+  end
+
+  def create_issue(problem, reported_by = nil)
+    unfuddle = TaskMapper.new(:unfuddle, :username => username, :password => password, :account => account)
+
+    begin
+      issue_options = {:project_id => project_id,
+        :summary => issue_title(problem),
+        :priority => '5',
+        :status => "new",
+        :description => body_template.result(binding),
+        'description-format' => 'textile' }
+
+      issue_options[:milestone_id] = milestone_id if milestone_id.present?
+
+      issue = unfuddle.project(project_id.to_i).ticket!(issue_options)
+      problem.update_attributes(
+                                :issue_link => File.join("#{url}/tickets/#{issue['id']}"),
+                                :issue_type => Label
+                                )
+    rescue ActiveResource::UnauthorizedAccess
+      raise ActiveResource::UnauthorizedAccess, "Could not authenticate with Unfuddle. Please check your username and password."
+    end
+
+  end
+
+  def body_template
+    @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/textile_body.txt.erb"))
+  end
+
+  def url
+    "https://#{account}.unfuddle.com/projects/#{project_id}"
+  end
+end
-require 'hoptoad'
 require 'recurse'
 class Notice
@@ -10,23 +9,20 @@ class Notice
   field :request, :type => Hash
   field :notifier, :type => Hash
   field :user_attributes, :type => Hash
-  field :current_user, :type => Hash
+  field :framework
   field :error_class
   delegate :lines, :to => :backtrace, :prefix => true
   delegate :app, :problem, :to => :err
   belongs_to :err
   belongs_to :backtrace, :index => true
-  index :created_at
-  index(
-    [
-      [ :err_id, Mongo::ASCENDING ],
-      [ :created_at, Mongo::ASCENDING ],
-      [ :_id, Mongo::ASCENDING ]
-    ]
-  )
-
-  after_create :increase_counter_cache, :cache_attributes_on_problem, :unresolve_problem
+
+  index(:created_at => 1)
+  index(:err_id => 1, :created_at => 1, :_id => 1)
+
+  after_create :cache_attributes_on_problem, :unresolve_problem
+  after_create :email_notification
+  after_create :services_notification
   before_save :sanitize
   before_destroy :decrease_counter_cache, :remove_cached_attributes_from_problem
@@ -42,7 +38,11 @@ class Notice
   end
   def user_agent_string
-    (user_agent.nil? || user_agent.none?) ? "N/A" : "#{user_agent.browser} #{user_agent.version}"
+    if user_agent.nil? || user_agent.none?
+      "N/A"
+    else
+      "#{user_agent.browser} #{user_agent.version} (#{user_agent.os})"
+    end
   end
   def environment_name
@@ -98,20 +98,29 @@ class Notice
     problem.notices_count
   end
-  def notifiable?
+  def emailable?
     app.email_at_notices.include?(similar_count)
   end
-  def should_notify?
-    app.notifiable? && notifiable?
+  def should_email?
+    app.emailable? && emailable?
   end
-  protected
+  def should_notify?
+    app.notification_service.notify_at_notices.include?(0) || app.notification_service.notify_at_notices.include?(similar_count)
+  end
-  def increase_counter_cache
-    problem.inc(:notices_count, 1)
+  ##
+  # TODO: Move on decorator maybe
+  #
+  def project_root
+    if server_environment
+      server_environment['project-root'] || ''
+    end
   end
+  protected
+
   def decrease_counter_cache
     problem.inc(:notices_count, -1) if err
   end
@@ -125,7 +134,7 @@ class Notice
   end
   def cache_attributes_on_problem
-    problem.cache_notice_attributes(self)
+    ProblemUpdaterCache.new(problem, self).update
   end
   def sanitize
@@ -134,6 +143,7 @@ class Notice
     end
   end
+
   def sanitize_hash(h)
     h.recurse do
       |h| h.inject({}) do |h,(k,v)|
@@ -147,5 +157,25 @@ class Notice
     end
   end
+  private
+
+  ##
+  # Send email notification if needed
+  def email_notification
+    return true unless should_email?
+    Mailer.err_notification(self).deliver
+  rescue => e
+    HoptoadNotifier.notify(e)
+  end
+
+  ##
+  # Launch all notification define on the app associate to this notice
+  def services_notification
+    return true unless app.notification_service_configured? and should_notify?
+    app.notification_service.create_notification(problem)
+  rescue => e
+    HoptoadNotifier.notify(e)
+  end
+
 end
@@ -1,13 +0,0 @@
-class NoticeObserver < Mongoid::Observer
-  observe :notice
-
-  def after_create notice
-    # if the app has a notification service, fire it off
-    if notice.app.notification_service_configured?
-      notice.app.notification_service.create_notification(notice.problem)
-    end
-
-    Mailer.err_notification(notice).deliver if notice.should_notify?
-  end
-
-end
@@ -5,14 +5,31 @@ class NotificationService
   default_url_options[:host] = ActionMailer::Base.default_url_options[:host]
   field :room_id, :type => String
+  field :user_id, :type => String
+  field :service_url, :type => String
+  field :service, :type => String
   field :api_token, :type => String
   field :subdomain, :type => String
   field :sender_name, :type => String
-  
+  field :notify_at_notices, :type => Array, :default => Errbit::Config.notify_at_notices
   embedded_in :app, :inverse_of => :notification_service
   validate :check_params
+  if Errbit::Config.per_app_notify_at_notices
+    Fields = [[:notify_at_notices, 
+               { :placeholder => 'comma separated numbers or simply 0 for every notice',
+                 :label => 'notify on errors (0 for all errors)'
+               }
+              ]]
+  else
+    Fields = []
+  end
+       
+  def notify_at_notices
+    Errbit::Config.per_app_notify_at_notices ? super : Errbit::Config.notify_at_notices
+  end
+
   # Subclasses are responsible for overwriting this method.
   def check_params; true; end
@@ -34,4 +51,8 @@ class NotificationService
   def configured?
     api_token.present?
   end
+
+  def problem_url(problem)
+    "http://#{Errbit::Config.host}/apps/#{problem.app.id}/problems/#{problem.id}"
+  end
 end
 if defined? Campy
   class NotificationServices::CampfireService < NotificationService
     Label = "campfire"
-    Fields = [
+    Fields += [
       [:subdomain, {
         :label       => "Subdomain",
         :placeholder => "subdomain from http://{{subdomain}}.campfirenow.com"
@@ -33,4 +33,4 @@ if defined? Campy
       campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
     end
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,45 @@
+if defined? Flowdock
+  class NotificationServices::FlowdockService < NotificationService
+    Label = 'flowdock'
+    Fields += [
+      [
+        :api_token, {
+          :label       => 'Flow API Token',
+          :placeholder => '123456789abcdef123456789abcdefgh'
+        }
+      ]
+    ]
+
+    def check_params
+      if Fields.any? { |f, _| self[f].blank? }
+        errors.add :base, 'You must specify your Flowdock(Flow) API token'
+      end
+    end
+
+    def url
+      'https://www.flowdock.com/session'
+    end
+
+    def create_notification(problem)
+      flow = Flowdock::Flow.new(:api_token => api_token, :source => "Errbit", :from => {:name => "Errbit", :address => ENV['ERRBIT_EMAIL_FROM'] || 'support@flowdock.com'})
+      subject = "[#{problem.environment}] #{problem.message.to_s.truncate(100)}"
+      url = app_problem_url problem.app, problem
+      flow.push_to_team_inbox(:subject => subject, :content => content(problem, url), :project => project_name(problem), :link => url)
+    end
+
+    private
+
+    # can only contain alphanumeric characters and underscores
+    def project_name(problem)
+      problem.app.name.gsub /[^0-9a-z_]/i, ''
+    end
+
+    def content(problem, url)
+      full_description = "[#{ problem.environment }][#{ problem.where }] #{problem.message.to_s}"
+      <<-MSG.strip_heredoc
+        #{ERB::Util.html_escape full_description}<br>
+        <a href="#{url}">#{url}</a>
+      MSG
+    end
+  end
+end
 class NotificationServices::GtalkService < NotificationService
   Label = "gtalk"
-  Fields = [
+  Fields += [
       [:subdomain, {
           :placeholder => "username@example.com",
           :label       => "Username"
@@ -9,29 +9,64 @@ class NotificationServices::GtalkService &lt; NotificationService
           :placeholder => "password",
           :label       => "Password"
       }],
+      [:user_id, {
+           :placeholder => "touser@example.com, anotheruser@example.com",
+           :label => "Send To User(s)"
+       }, :room_id],
       [:room_id, {
-          :placeholder => "touser@example.com",
-          :label       => "Send To User"
+          :placeholder => "toroom@conference.example.com",
+          :label       =>  "Send To Room (one only)"
+      }, :user_id],
+      [ :service, {
+          :placeholder => "talk.google.com",
+          :label => "Jabber Service"
       }],
+      [ :service_url, {
+          :placeholder => "http://www.google.com/talk/",
+          :label => "Link To Jabber Service"
+      }]
   ]
   def check_params
-    if Fields.detect {|f| self[f[0]].blank? }
-      errors.add :base, 'You must specify your Username, Password and To User'
+    if Fields.detect { |f| self[f[0]].blank? && self[f[2]].blank? } 
+      errors.add :base, 
+      """You must specify your Username, Password, service, service_url 
+         and either rooms or users to send to or both"""
     end
   end
   def url
-    "http://www.google.com/talk/"
+    service_url || "http://www.google.com/talk/"
   end
   def create_notification(problem)
     # build the xmpp client
     client = Jabber::Client.new(Jabber::JID.new(subdomain))
-    client.connect("talk.google.com")
+    client.connect(service)
     client.auth(api_token)
-    # post the issue to the xmpp room
-    client.send(Jabber::Message.new(room_id, "[errbit] http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_description problem}"))
+    #has to look like this to be formatted properly in the client
+    message =  """#{problem.app.name.to_s}
+http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{notification_description problem}"""
+
+    # post the issue to the xmpp room(s)
+    send_to_users(client, message) unless user_id.blank?
+    send_to_muc(client, message) unless room_id.blank?
+  end
+
+  private
+ 
+  def send_to_users client, message
+    user_id.gsub(/ /i, ",").gsub(/;/i, ",").split(",").map(&:strip).reject(&:empty?).each do |user|
+      client.send(Jabber::Message.new(user, message))
+    end
+  end
+
+  def send_to_muc client, message
+    #TODO: set this so that it can send to multiple rooms like users, nb multiple room joins in one send fail randomly so leave as one room for the moment 
+    muc = Jabber::MUC::SimpleMUCClient.new(client)
+    muc.join(room_id + "/errbit") 
+    muc.send(Jabber::Message.new(room_id, message))
   end
-end
 \ No newline at end of file
+end
 if defined? HipChat
   class NotificationServices::HipchatService < NotificationService
     Label = 'hipchat'
-    Fields = [
+    Fields += [
       [:api_token, {
         :placeholder => "API Token"
       }],
@@ -24,8 +24,9 @@ if defined? HipChat
     def create_notification(problem)
       url = app_problem_url problem.app, problem
       message = <<-MSG.strip_heredoc
-        [#{ERB::Util.html_escape problem.app.name}]#{ERB::Util.html_escape notification_description(problem)}<br>
-        <a href="#{url}">#{url}</a>
+        <strong>#{ERB::Util.html_escape problem.app.name}</strong> error in <strong>#{ERB::Util.html_escape problem.environment}</strong> at <strong>#{ERB::Util.html_escape problem.where}</strong> (<a href="#{url}">details</a>)<br>
+        &nbsp;&nbsp;#{ERB::Util.html_escape problem.message.to_s.truncate(100)}<br>
+        &nbsp;&nbsp;Times occurred: #{problem.notices_count}
       MSG
       client = HipChat::Client.new(api_token)
 class NotificationServices::HoiioService < NotificationService
   Label = "hoiio"
-  Fields = [
+  Fields += [
       [:api_token, {
           :placeholder => "App ID",
           :label => "App ID"
@@ -39,4 +39,4 @@ class NotificationServices::HoiioService &lt; NotificationService
     end
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,32 @@
+class NotificationServices::HubotService < NotificationService
+  Label = "hubot"
+  Fields += [
+    [:api_token, {
+      :placeholder => 'http://hubot.example.org:8080/hubot/say',
+      :label => 'Hubot URL'
+    }],
+    [:room_id, {
+      :placeholder => '#dev',
+      :label => 'Room where Hubot should notify'
+    }]
+  ]
+
+  def check_params
+    if Fields.detect {|f| self[f[0]].blank? }
+      errors.add :base, 'You must specify the URL of your hubot'
+    end
+  end
+
+  def url
+    api_token
+  end
+
+  def message_for_hubot(problem)
+    "[#{problem.app.name}][#{problem.environment}][#{problem.where}]: #{problem.error_class} #{problem_url(problem)}"
+  end
+
+  def create_notification(problem)
+    HTTParty.post(url, :body => {:message => message_for_hubot(problem), :room => room_id})
+  end
+end
+
 class NotificationServices::PushoverService < NotificationService
   Label = "pushover"
-  Fields = [
+  Fields += [
       [:api_token, {
           :placeholder => "User Key",
           :label => "User Key"
@@ -29,4 +29,4 @@ class NotificationServices::PushoverService &lt; NotificationService
     notification.notify(api_token, "#{notification_description problem}", :priority => 1, :title => "Errbit Notification", :url => "http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}", :url_title => "Link to error")
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,19 @@
+class NotificationServices::WebhookService < NotificationService
+  Label = "webhook"
+  Fields = [
+    [:api_token, {
+      :placeholder => 'URL to receive a POST request when an error occurs',
+      :label => 'URL'
+    }]
+  ]
+
+  def check_params
+    if Fields.detect {|f| self[f[0]].blank? }
+      errors.add :base, 'You must specify the URL'
+    end
+  end
+
+  def create_notification(problem)
+    HTTParty.post(api_token, :body => {:problem => problem.to_json})
+  end
+end
@@ -26,29 +26,39 @@ class Problem
   field :hosts,       :type => Hash, :default => {}
   field :comments_count, :type => Integer, :default => 0
-  index :app_id
-  index :app_name
-  index :message
-  index :last_notice_at
-  index :first_notice_at
-  index :last_deploy_at
-  index :resolved_at
-  index :notices_count
+  index :app_id => 1
+  index :app_name => 1
+  index :message => 1
+  index :last_notice_at => 1
+  index :first_notice_at => 1
+  index :last_deploy_at => 1
+  index :resolved_at => 1
+  index :notices_count => 1
   belongs_to :app
   has_many :errs, :inverse_of => :problem, :dependent => :destroy
   has_many :comments, :inverse_of => :err, :dependent => :destroy
+  validates_presence_of :environment
+
   before_create :cache_app_attributes
   scope :resolved, where(:resolved => true)
   scope :unresolved, where(:resolved => false)
   scope :ordered, order_by(:last_notice_at.desc)
   scope :for_apps, lambda {|apps| where(:app_id.in => apps.all.map(&:id))}
-  
+
   validates_presence_of :last_notice_at, :first_notice_at
+  def self.all_else_unresolved(fetch_all)
+    if fetch_all
+      all
+    else
+      where(:resolved => false)
+    end
+  end
+
   def self.in_env(env)
     env.present? ? where(:environment => env) : scoped
   end
@@ -75,15 +85,7 @@ class Problem
   def self.merge!(*problems)
-    problems = problems.flatten.uniq
-    merged_problem = problems.shift
-    problems.each do |problem|
-      merged_problem.errs.concat Err.where(:problem_id => problem.id)
-      problem.errs(true) # reload problem.errs (should be empty) before problem.destroy
-      problem.destroy
-    end
-    merged_problem.reset_cached_attributes
-    merged_problem
+    ProblemMerge.new(problems).merge
   end
   def merged?
@@ -91,11 +93,12 @@ class Problem
   end
   def unmerge!
+    attrs = {:error_class => error_class, :environment => environment}
     problem_errs = errs.to_a
     problem_errs.shift
     [self] + problem_errs.map(&:id).map do |err_id|
       err = Err.find(err_id)
-      app.problems.create.tap do |new_problem|
+      app.problems.create(attrs).tap do |new_problem|
         err.update_attribute(:problem_id, new_problem.id)
         new_problem.reset_cached_attributes
       end
@@ -113,16 +116,14 @@ class Problem
     else raise("\"#{sort}\" is not a recognized sort")
     end
   end
-  
+
   def self.in_date_range(date_range)
     where(:first_notice_at.lte => date_range.end).where("$or" => [{:resolved_at => nil}, {:resolved_at.gte => date_range.begin}])
   end
   def reset_cached_attributes
-    update_attribute(:notices_count, notices.count)
-    cache_app_attributes
-    cache_notice_attributes
+    ProblemUpdaterCache.new(self).update
   end
   def cache_app_attributes
@@ -131,32 +132,12 @@ class Problem
       self.last_deploy_at = if (last_deploy = app.deploys.where(:environment => self.environment).last)
         last_deploy.created_at.utc
       end
-      collection.update({'_id' => self.id},
-                        {'$set' => {'app_name' => self.app_name,
+      collection.find('_id' => self.id)
+                .update({'$set' => {'app_name' => self.app_name,
                           'last_deploy_at' => self.last_deploy_at.try(:utc)}})
     end
   end
-  def cache_notice_attributes(notice=nil)
-    first_notice = notices.order_by([:created_at, :asc]).first
-    last_notice = notices.order_by([:created_at, :asc]).last
-    notice ||= first_notice
-    
-    attrs = {}
-    attrs[:first_notice_at] = first_notice.created_at if first_notice
-    attrs[:last_notice_at] = last_notice.created_at if last_notice
-    attrs.merge!(
-      :message     => notice.message,
-      :environment => notice.environment_name,
-      :error_class => notice.error_class,
-      :where       => notice.where,
-      :messages    => attribute_count_increase(:messages, notice.message),
-      :hosts       => attribute_count_increase(:hosts, notice.host),
-      :user_agents => attribute_count_increase(:user_agents, notice.user_agent_string)
-    ) if notice
-    update_attributes!(attrs)
-  end
-
   def remove_cached_notice_attributes(notice)
     update_attributes!(
       :messages    => attribute_count_descrease(:messages, notice.message),
@@ -171,16 +152,17 @@ class Problem
     (app.issue_tracker_configured? && app.issue_tracker.label) || nil
   end
+  def self.search(value)
+    any_of(
+      {:error_class => /#{value}/i},
+      {:where => /#{value}/i},
+      {:message => /#{value}/i},
+      {:app_name => /#{value}/i},
+      {:environment => /#{value}/i}
+    )
+  end
+
   private
-    def attribute_count_increase(name, value)
-      counter, index = send(name), attribute_index(value)
-      if counter[index].nil?
-        counter[index] = {'value' => value, 'count' => 1}
-      else
-        counter[index]['count'] += 1
-      end
-      counter
-    end
     def attribute_count_descrease(name, value)
       counter, index = send(name), attribute_index(value)
@@ -195,6 +177,5 @@ class Problem
     def attribute_index(value)
       Digest::MD5.hexdigest(value.to_s)
     end
-
 end
@@ -13,14 +13,33 @@ class User
   field :per_page, :type => Fixnum, :default => PER_PAGE
   field :time_zone, :default => "UTC"
-  after_destroy :destroy_watchers
+  ## Devise field
+  ### Database Authenticatable
+  field :encrypted_password, :type => String
+
+  ### Recoverable
+  field :reset_password_token, :type => String
+  field :reset_password_sent_at, :type => Time
+
+  ### Rememberable
+  field :remember_created_at, :type => Time
+
+  ### Trackable
+  field :sign_in_count,      :type => Integer
+  field :current_sign_in_at, :type => Time
+  field :last_sign_in_at,    :type => Time
+  field :current_sign_in_ip, :type => String
+  field :last_sign_in_ip,    :type => String
+
+  ### Token_authenticatable
+  field :authentication_token, :type => String
+
+
   before_save :ensure_authentication_token
   validates_presence_of :name
   validates_uniqueness_of :github_login, :allow_nil => true
-  attr_protected :admin
-
   has_many :apps, :foreign_key => 'watchers.user_id'
   if Errbit::Config.user_has_username
@@ -52,10 +71,12 @@ class User
     github_account? && Errbit::Config.github_access_scope.include?('repo')
   end
-  protected
-
-    def destroy_watchers
-      watchers.each(&:destroy)
+  def github_login=(login)
+    if login.is_a?(String) && login.strip.empty?
+      login = nil
     end
+    self[:github_login] = login
+  end
+
 end
-= errors_for @app
+= errors_for app
 %div.required
   = f.label :name
@@ -13,6 +13,10 @@
 %div
   = f.label :bitbucket_repo
   = f.text_field :bitbucket_repo, :placeholder => "errbit/errbit from https://bitbucket.org/errbit/errbit"
+%div
+  = f.label :asset_host
+  %em Used to generate links for JavaScript errors
+  = f.text_field :asset_host, :placeholder => "e.g. https://assets.example.com"
 %fieldset
   %legend Notifications
@@ -17,7 +17,8 @@
           - notification_service::Fields.each do |field, field_info|
             = w.label field, field_info[:label] || field.to_s.titleize
             - field_type = field == :password ? :password_field : :text_field
-            = w.send field_type, field, :placeholder => field_info[:placeholder], :value => w.object.send(field)
+            - value = field == :notify_at_notices ? w.object.notify_at_notices.join(", ") : w.object.send(field)
+            = w.send field_type, field, :placeholder => field_info[:placeholder], :value => value
       .image_preloader
         - (NotificationService.subclasses.map{|t| t.label } << 'none').each do |notification_service|
 - content_for :title, 'Edit App'
 - content_for :action_bar do
   = link_to_copy_attributes_from_other_app
-  = link_to('cancel', app_path(@app), :class => 'button')
+  = link_to 'destroy application', app_path(app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
+  = link_to('cancel', app_path(app), :class => 'button')
-= form_for @app do |f|
+= form_for app do |f|
   = render 'fields', :f => f
-- content_for :title, 'Apps'
+- content_for :title, t('.title')
 - content_for :action_bar do
-  %span= link_to('Add a New App', new_app_path, :class => 'add') if current_user.admin?
+  %span= link_to(t('.new_app'), new_app_path, :class => 'add') if current_user.admin?
 %table.apps
   %thead
     %tr
-      %th Name
+      %th= t('.name')
       - if any_github_repos? || any_bitbucket_repos?
-        %th Repository
+        %th= t('.repository')
       - if any_notification_services?
-        %th Notification Service
+        %th= t('.notify')
       - if any_issue_trackers?
-        %th Tracker
+        %th= t('.tracker')
       - if any_deploys?
-        %th Last Deploy
-      %th Errors
+        %th= t('.last_deploy')
+      %th=t('.errors')
   %tbody
-    - @apps.each do |app|
+    - apps.each do |app|
       %tr
         %td.name= link_to app.name, app_path(app)
         - if any_github_repos? or any_bitbucket_repos?
@@ -50,10 +50,10 @@
           - if app.problem_count > 0
             - unresolved = app.unresolved_count
             = link_to unresolved, app_path(app), :class => (unresolved == 0 ? "resolved" : nil)
-    - if @apps.none?
+    - if apps.none?
       %tr
         %td{:colspan => 3}
           %em
-            No apps here.
-            = link_to 'Click here to create your first one', new_app_path
+            = t('.no_apps')
+            = link_to t('.click_to_create'), new_app_path
@@ -3,7 +3,7 @@
   = link_to_copy_attributes_from_other_app
   = link_to('cancel', apps_path, :class => 'button')
-= form_for @app do |f|
+= form_for app do |f|
   = render 'fields', :f => f
 atom_feed do |feed|
-  feed.title("Errbit notices for #{h @app.name} at #{root_url}")
+  feed.title("Errbit notices for #{h app.name} at #{root_url}")
   render "problems/list", :feed => feed
 end
-- content_for :title, @app.name
+- content_for :title, app.name
 - content_for :head do
-  = auto_discovery_link_tag :atom, app_path(@app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{@app.name} at #{request.host}"
+  = auto_discovery_link_tag :atom, app_path(app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{app.name} at #{request.host}"
 - content_for :meta do
   %strong Errors Caught:
-  = @app.problems.count
+  = app.problems.count
   %strong Deploy Count:
-  = @app.deploys.count
+  = app.deploys.count
   %strong API Key:
-  = @app.api_key
+  = app.api_key
 - content_for :action_bar do
   - if current_user.admin?
-    = link_to 'edit', edit_app_path(@app), :class => 'button'
-    = link_to 'destroy', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
-  - if @all_errs
-    = link_to 'unresolved errs', app_path(@app), :class => 'button'
+    = link_to 'edit', edit_app_path(app), :class => 'button'
+  - if all_errs
+    = link_to 'unresolved errs', app_path(app), :class => 'button'
   - else
-    = link_to 'all errs', app_path(@app, :all_errs => true), :class => 'button'
+    = link_to 'all errs', app_path(app, :all_errs => true), :class => 'button'
   = link_to 'unwatch',  app_watcher_path({:app_id => @app, :id => current_user.id}), :method => :delete, :class => 'button', :confirm => 'Are you sure?'
+
 %h3#watchers_toggle
   Watchers
   %span.click_span (show/hide)
 #watchers_div
-  - if @app.notify_all_users
+  - if app.notify_all_users
     %table.watchers
       %thead
         %tr
@@ -32,15 +32,15 @@
         %tr
           %th User or Email
       %tbody
-        - @app.watchers.each do |watcher|
+        - app.watchers.each do |watcher|
           %tr
             %td= watcher.label
-        - if @app.watchers.none?
+        - if app.watchers.none?
           %tr
             %td
               %em Sadly, no one is watching this app
-- if @app.github_repo?
+- if app.github_repo?
   %h3#repository_toggle
     Repository
     %span.click_span (show/hide)
@@ -51,13 +51,13 @@
           %th GitHub Repo
       %tbody
         %tr
-          %td= link_to(@app.github_repo, @app.github_url, :target => '_blank')
+          %td= link_to(app.github_repo, app.github_url, :target => '_blank')
 %h3#deploys_toggle
   Latest Deploys
   %span.click_span (show/hide)
 #deploys_div
-  - if @deploys.any?
+  - if deploys.any?
     %table.deploys
       %thead
         %tr
@@ -69,7 +69,7 @@
           %th Revision
       %tbody
-        - @deploys.each do |deploy|
+        - deploys.each do |deploy|
           %tr
             %td.when #{deploy.created_at.to_s(:micro)}
             %td.environment #{deploy.environment}
@@ -77,14 +77,20 @@
             %td.message #{deploy.message}
             %td.repository #{deploy.repository}
             %td.revision #{deploy.short_revision}
-    = link_to "All Deploys (#{@app.deploys.count})", app_deploys_path(@app), :class => 'button'
+    = link_to "All Deploys (#{app.deploys.count})", app_deploys_path(app), :class => 'button'
   - else
     %h3 No deploys
-- if @app.problems.any?
+- if app.problems.any?
   %h3.clear Errors
-  = render 'problems/table', :problems => @problems
+  %section
+    = form_tag search_problems_path(:all_errs => all_errs, :app_id => app.id), :method => :get, :remote => true do
+      = text_field_tag :search, params[:search], :placeholder => 'Search for issues'
+  %br
+  %section
+    .problem_table{:id => 'problem_table'}
+      = render 'problems/table', :problems => problems
 - else
   %h3.clear No errs have been caught yet, make sure you setup your app
-  = render 'configuration_instructions', :app => @app
+  = render 'configuration_instructions', :app => app
@@ -9,7 +9,7 @@
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
   .required
     = f.label auth_key
-    = f.text_field auth_key, :tabindex => 1
+    = f.text_field auth_key, :type => (Errbit::Config.user_has_username ? 'text' : 'email'), :tabindex => 1
   .required
     = link_to 'forget it?', new_password_path(resource_name), :class => 'float-right', :id => "forgot_password"
-[See this exception on Errbit](<%= app_problem_url problem.app, problem %> "See this exception on Errbit")
 <% if notice = problem.notices.first %>
-# <%= notice.message %> #
-## Summary ##
-<% if notice.request['url'].present? %>
-  ### URL ###
-  [<%= notice.request['url'] %>](<%= notice.request['url'] %>)"
-<% end %>
-### Where ###
-<%= notice.where %>
-
-### Occured ###
-<%= notice.created_at.to_s(:micro) %>
-
-### Similar ###
-<%= (notice.problem.notices_count - 1).to_s %>
-
 ## Params ##
 ```
 <%= pretty_hash(notice.params) %>
@@ -0,0 +1,17 @@
+[See this exception on Errbit](<%= app_problem_url problem.app, problem %> "See this exception on Errbit")
+<% if notice = problem.notices.first %>
+# <%= notice.message %> #
+## Summary ##
+<% if notice.request['url'].present? %>
+  ### URL ###
+  [<%= notice.request['url'] %>](<%= notice.request['url'] %>)"
+<% end %>
+### Where ###
+<%= notice.where %>
+
+### Occured ###
+<%= notice.created_at.to_s(:micro) %>
+
+### Similar ###
+<%= (notice.problem.notices_count - 1).to_s %>
+<% end %>
 \ No newline at end of file
@@ -0,0 +1,17 @@
+<% if notice = problem.notices.first %>
+h2. Summary
+<% if notice.request['url'].present? %>
+h3. URL
+
+"<%= notice.request['url'] %>":<%= notice.request['url'] %>
+<% end %>
+h3. Where
+
+<%= notice.where %>
+
+h3. When
+
+<%= notice.created_at.to_s(:micro) %>
+
+"More Details on Errbit":<%= app_problem_url problem.app, problem %>
+<% end %>
 \ No newline at end of file
@@ -0,0 +1,17 @@
+<% if notice = problem.notices.first %>
+h2. Summary
+<% if notice.request['url'].present? %>
+h3. URL
+
+"<%= notice.request['url'] %>":<%= notice.request['url'] %>
+<% end %>
+h3. Where
+
+<%= notice.where %>
+
+h3. When
+
+<%= notice.created_at.to_s(:micro) %>
+
+"More Details on Errbit":<%= app_problem_url problem.app, problem %>
+<% end %>
 \ No newline at end of file
@@ -6,9 +6,9 @@
 -#    remote:        data-remote
 -#    paginator:     the paginator that renders the pagination tags inside
 = paginator.render do
-  .notice-pagination<
+  .notice-pagination
     = next_page_tag
-    |&nbsp;
+    |
     = prev_page_tag
 .notice-pagination-loader= image_tag 'loader.gif'
-viewing occurrence #{page_count_from_end(current_page, total_pages)} of #{total_pages}
+%div viewing occurrence #{page_count_from_end(current_page, total_pages)} of #{total_pages}
@@ -2,7 +2,8 @@
 %html
   %head
     %title
-      Errbit &mdash;
+      = t('.title')
+      &mdash;
       = yield(:page_title).present? ? yield(:page_title) : yield(:title)
     %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "content-type" }/
     = favicon_link_tag
@@ -14,7 +15,7 @@
   %body{:id => controller.controller_name, :class => controller.action_name}
     #header
       %div
-        = link_to 'Errbit', root_path, :id => 'site-name'
+        = link_to t('.errbit'), root_path, :id => 'site-name'
         = render 'shared/navigation' if current_user
         = render 'shared/session'
     #content-wrapper
@@ -30,5 +31,5 @@
       - if content_for?(:comments)
         #content-comments
           = yield :comments
-    #footer Powered by #{link_to 'Errbit', 'http://github.com/errbit/errbit', :target => '_blank'}: the open source error catcher.
+    #footer= t('.powered_html', :link => link_to(t('.errbit'), 'http://github.com/errbit/errbit', :target => '_blank'))
     = yield :scripts
@@ -0,0 +1,50 @@
+%tr
+  %td.section
+    %table(cellpadding="0" cellspacing="0" border="0" align="left")
+      %tbody
+        %tr
+          %td.content(valign="top")
+            %div
+              %p
+                = @user.name
+                has just commented on an error that occurred in
+                = link_to(@app.name, app_url(@app), :class => "bold") << ","
+                on the
+                %span.bold= @problem.environment
+                environment.
+                %br
+                This err has occurred #{pluralize @problem.notices_count, 'time'}.
+              %p
+                = link_to("Click here to view the error and add a comment on Errbit", app_problem_url(@app, @problem), :class => "bold") << "."
+
+%tr
+  %td.section
+    %table(cellpadding="0" cellspacing="0" border="0" align="left")
+      %tbody
+        %tr
+          %td.content(valign="top")
+            %div
+              %p.heading COMMENT:
+              %br
+              %p= @comment.body.to_s.gsub("\n", "<br/>").html_safe
+
+%tr
+  %td.section
+    %table(cellpadding="0" cellspacing="0" border="0" align="left")
+      %tbody
+        %tr
+          %td.content(valign="top")
+            %div
+              %p.heading ERROR MESSAGE:
+              %p= @problem.message
+              %p.heading WHERE:
+              %p.monospace
+                = @problem.where
+              %p.heading URL:
+              %p.monospace
+                - if @notice.request['url'].present?
+                  = link_to @notice.request['url'], @notice.request['url']
+              %p.heading BROWSER:
+              %p.monospace
+                = user_agent_graph(@problem)
+              %br
@@ -0,0 +1,36 @@
+<%= @user.name %> has just commented on an error that occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
+
+This err has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
+
+  <%= app_problem_url(@app, @notice.problem) %>
+
+
+COMMENT:
+
+<%= @comment.body %>
+
+
+-----------------------------------------------
+
+ERROR MESSAGE:
+
+<%= raw(@notice.message) %>
+
+
+WHERE:
+
+<%= @notice.where %>
+
+<% @notice.in_app_backtrace_lines.each do |line| %>
+  <%= line %>
+<% end %>
+
+
+URL:
+
+<%= @notice.request['url'] %>
+
+
+BROWSER:
+
+<%= @notice.user_agent_string %>
@@ -28,14 +28,31 @@
               %p.monospace
                 = @notice.where
               - @notice.in_app_backtrace_lines.each do |line|
-                %p.backtrace= line
-                %br
+                %p.backtrace
+                  = link_to_source_file(line) do
+                    = line.to_s
+              %br
               %p.heading URL:
               %p.monospace
                 - if @notice.request['url'].present?
                   = link_to @notice.request['url'], @notice.request['url']
-              %p.heading BACKTRACE:
-              - @notice.backtrace_lines.each do |line|
-                %p.backtrace= line
+              %p.heading BROWSER:
+              %p.monospace
+                = user_agent_graph(@notice.problem)
               %br
-
+              - if @notice.user_attributes.present?
+                %p.heading USER:
+                %table
+                  - @notice.user_attributes.each do |key, value|
+                    %tr
+                      %td(style="text-align: right; padding-right: 10px; color: #6a6a6a;")= key.to_s.titleize + ":"
+                      %td= auto_link(value.to_s)
+                %br
+              - if @notice.backtrace_lines.any?
+                %br
+                %p.heading FULL BACKTRACE:
+                - @notice.backtrace_lines.each do |line|
+                  %p.backtrace
+                    = link_to_source_file(line) do
+                      = line.to_s
+                %br
@@ -24,6 +24,20 @@ URL:
 <%= @notice.request['url'] %>
+BROWSER:
+
+<%= @notice.user_agent_string %>
+
+
+<%- if @notice.user_attributes.present? %>
+USER:
+
+<%- @notice.user_attributes.each do |key, value| %>
+<%= key.to_s.titleize %>: <%= value.to_s %>
+<%- end %>
+
+<%- end %>
+
 BACKTRACE:
 <% @notice.backtrace_lines.each do |line| %>
 %tr{:class => defined?(row_class) && row_class}
   %td.line{:class => line.in_app? && 'in-app' }
     = link_to_source_file(line) do
-      %span.path>=raw line.decorated_path
+      %span.path>= raw line.decorated_path
       %span.file>= line.file_name
       - if line.number.present?
         %span.number>= ":#{line.number}"
+      - if line.column.present?
+        %span.number>= ":#{line.column}"
     &rarr;
     %span.method= line.method
@@ -28,6 +28,10 @@
     %tr
       %th App Server
       %td= notice.server_environment && notice.server_environment["hostname"]
+    - if notice.framework
+      %tr
+        %th Framework
+        %td= notice.framework
     %tr
       %th Rel. Directory
       %td= notice.server_environment && notice.server_environment["project-root"]
@@ -2,8 +2,8 @@
   %table.user_attributes
     %tr
       %td
-        %strong Information about the user who experienced the error.
-    - user.each do |user_key, user_value|
+        %strong The user who experienced the error:
+    - user.each do |key, value|
       %tr
-        %th= user_key
-        %td= auto_link(user_value.to_s).html_safe
+        %th= key
+        %td= auto_link(auto_link(value.to_s, :urls, :target => "_blank"), :email_addresses).html_safe
-- if @app.issue_tracker_configured? || current_user.github_account?
-  - if @problem.issue_link.present?
-    %span= link_to 'go to issue', @problem.issue_link, :class => "#{@problem.issue_type}_goto goto-issue"
-    = link_to 'unlink issue', unlink_issue_app_problem_path(@app, @problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue"
-  - elsif @problem.issue_link == "pending"
-    %span.disabled= link_to 'creating...', '#', :class => "#{@problem.issue_type}_inactive create-issue"
-    = link_to 'retry', create_issue_app_problem_path(@app, @problem), :method => :post
+- if app.issue_tracker_configured? || current_user.github_account?
+  - if problem.issue_link.present?
+    %span= link_to 'go to issue', problem.issue_link, :class => "#{problem.issue_type}_goto goto-issue"
+    = link_to 'unlink issue', unlink_issue_app_problem_path(app, problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue"
+  - elsif problem.issue_link == "pending"
+    %span.disabled= link_to 'creating...', '#', :class => "#{problem.issue_type}_inactive create-issue"
+    = link_to 'retry', create_issue_app_problem_path(app, problem), :method => :post
   - else
-    - if @app.github_repo?
+    - if app.github_repo?
       - if current_user.can_create_github_issues?
-        %span= link_to 'create issue', create_issue_app_problem_path(@app, @problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
-      - elsif @app.issue_tracker_configured? && @app.issue_tracker.is_a?(GithubIssuesTracker)
-        %span= link_to 'create issue', create_issue_app_problem_path(@app, @problem), :method => :post, :class => "github_create create-issue"
-    - if @app.issue_tracker_configured? && !@app.issue_tracker.is_a?(GithubIssuesTracker)
-      %span= link_to 'create issue', create_issue_app_problem_path(@app, @problem), :method => :post, :class => "#{@app.issue_tracker.label}_create create-issue"
+        %span= link_to 'create issue', create_issue_app_problem_path(app, problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
+      - elsif app.issue_tracker_configured? && app.issue_tracker.label.eql?('github')
+        %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "github_create create-issue"
+    - if app.issue_tracker_configured? && !app.issue_tracker.label.eql?('github')
+      %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "#{app.issue_tracker.label}_create create-issue"
-feed.updated(@problems.first.try(:created_at) || Time.now)
+feed.updated(problems.first.try(:created_at) || Time.now)
-for problem in @problems
+for problem in problems
   notice = problem.notices.first
-  feed.entry(problem, :url => app_problem_url(problem.app, problem)) do |entry|
+  feed.entry(problem, :url => app_problem_url(problem.app.to_param, problem.to_param)) do |entry|
     entry.title "[#{ problem.where }] #{problem.message.to_s.truncate(27)}"
     entry.author do |author|
       author.name "#{ problem.app.name } [#{ problem.environment }]"
@@ -16,7 +16,7 @@
       - problems.each do |problem|
         %tr{:class => problem.resolved? ? 'resolved' : 'unresolved'}
           %td.select
-            = check_box_tag "problems[]", problem.id, @selected_problems.member?(problem.id.to_s)
+            = check_box_tag "problems[]", problem.id, selected_problems.member?(problem.id.to_s)
           %td.app
             = link_to problem.app.name, app_path(problem.app)
             - if current_page?(:controller => 'problems')
@@ -48,9 +48,5 @@
   = paginate problems
   .tab-bar
     %ul
-      %li= submit_tag 'Merge', :id => 'merge_problems', :class => 'button', 'data-action' => merge_several_problems_path
-      %li= submit_tag 'Unmerge', :id => 'unmerge_problems', :class => 'button', 'data-action' => unmerge_several_problems_path
-      %li= submit_tag 'Resolve', :id => 'resolve_problems', :class => 'button', 'data-action' => resolve_several_problems_path
-      %li= submit_tag 'Unresolve', :id => 'unresolve_problems', :class => 'button', 'data-action' => unresolve_several_problems_path
-      %li= submit_tag 'Delete', :id => 'delete_problems', :class => 'button', 'data-action' => destroy_several_problems_path
-
+      - %w(merge unmerge resolve unresolve delete).each do |action|
+        %li= submit_tag action.capitalize, :id => "#{action}_problems", :class => 'button', :data => { :action => polymorphic_path([action == 'delete' ? 'destroy' : action, 'several_problems']), :confirm => problem_confirm }
@@ -1,4 +0,0 @@
-- content_for :title, 'All Errors'
-- content_for :action_bar do
-  = link_to 'hide resolved', problems_path, :class => 'button'
-= render 'table', :problems => @problems
-- content_for :title, 'Unresolved Errors'
+- content_for :title, @all_errs ? 'All Errors' : 'Unresolved Errors'
 - content_for :head do
   = auto_discovery_link_tag :atom, problems_path(User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices at #{request.host}"
+
 - content_for :action_bar do
-  = link_to 'show resolved', all_problems_path, :class => 'button'
-= render 'table', :problems => @problems
+  - if @all_errs
+    = link_to 'hide resolved', problems_path, :class => 'button'
+  - else
+    = link_to 'show resolved', problems_path(:all_errs => true), :class => 'button'
+
+%section
+  = form_tag search_problems_path(:all_errs => @all_errs), :method => :get, :remote => true do
+    = text_field_tag :search, params[:search], :placeholder => 'Search for issues'
+%br
+%section
+  #problem_table.problem_table
+    = render 'problems/table'
@@ -0,0 +1,2 @@
+$("#problem_table").empty().append("#{escape_javascript(render('problems/table', :problems => problems))}");
+$("#flash-messages").empty()
-- content_for :page_title, @problem.message
+- content_for :page_title, problem.message
 - content_for :title_css_class, 'err_show'
-- content_for :title, @problem.error_class || truncate(@problem.message, :length => 32)
+- content_for :title, problem.error_class || truncate(problem.message, :length => 32)
 - content_for :meta do
   %strong App:
-  = link_to @app.name, @app
+  = link_to app.name, app
   %strong Where:
-  = @problem.where
+  = problem.where
   %br
   %strong Environment:
-  = @problem.environment
+  = problem.environment
   %strong Last Notice:
-  = @problem.last_notice_at.to_s(:precise)
+  = problem.last_notice_at.to_s(:precise)
 - content_for :action_bar do
-  - if @problem.unresolved?
-    %span= link_to 'resolve', [:resolve, @app, @problem], :method => :put, :data => { :confirm => problem_confirm }, :class => 'resolve'
+  - if problem.unresolved?
+    %span= link_to 'resolve', [:resolve, app, problem], :method => :put, :data => { :confirm => problem_confirm }, :class => 'resolve'
   - if current_user.authentication_token
-    %span= link_to 'iCal', polymorphic_path([@app, @problem], :format => "ics", :auth_token => current_user.authentication_token), :class => "calendar_link"
-  %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_problems_path(@app)), :class => 'up'
+    %span= link_to 'iCal', polymorphic_path([app, problem], :format => "ics", :auth_token => current_user.authentication_token), :class => "calendar_link"
+  %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_problems_path(app)), :class => 'up'
   %br
   = render "issue_tracker_links"
-- if @problem.comments_allowed? || @problem.comments.any?
+- if problem.comments_allowed? || problem.comments.any?
   - content_for :comments do
     %h3 Comments
-    - @problem.comments.each do |comment|
+    - problem.comments.each do |comment|
       .window
         %table.comment
           %tr
@@ -37,11 +37,11 @@
               - else
                 %span.comment-info
                   = time_ago_in_words(comment.created_at, true) << " ago by [Unknown User]"
-              %span.delete= link_to '&#10008;'.html_safe, [@app, @problem, comment], :method => :delete, :data => { :confirm => "Are sure you don't need this comment?" }, :class => "destroy-comment"
+              %span.delete= link_to '&#10008;'.html_safe, [app, problem, comment], :method => :delete, :data => { :confirm => "Are you sure you don't need this comment?" }, :class => "destroy-comment"
           %tr
             %td= simple_format comment.body
-    - if @problem.comments_allowed?
-      = form_for [@app, @problem, @comment] do |comment_form|
+    - if problem.comments_allowed?
+      = form_for [app, problem, @comment] do |comment_form|
         %p Add a comment
         = comment_form.text_area :body
         = comment_form.submit "Save Comment"
@@ -55,7 +55,7 @@
     %li= link_to 'Summary', '#summary', :rel => 'summary', :class => 'button'
     %li= link_to 'Backtrace', '#backtrace', :rel => 'backtrace', :class => 'button'
     - if @notice && @notice.user_attributes.present?
-      %li= link_to 'User Details', '#user_attributes', :rel => 'user_attributes', :class => 'button'
+      %li= link_to 'User', '#user_attributes', :rel => 'user_attributes', :class => 'button'
     %li= link_to 'Environment', '#environment', :rel => 'environment', :class => 'button'
     %li= link_to 'Parameters', '#params', :rel => 'params', :class => 'button'
     %li= link_to 'Session', '#session', :rel => 'session', :class => 'button'
@@ -63,7 +63,7 @@
 - if @notice
   #summary
     %h3 Summary
-    = render 'notices/summary', :notice => @notice, :problem => @problem
+    = render 'notices/summary', :notice => @notice
   #backtrace
     %h3 Backtrace
@@ -71,7 +71,7 @@
   - if @notice.user_attributes.present?
     #user_attributes
-      %h3 User Details
+      %h3 User
       = render 'notices/user_attributes', :user => @notice.user_attributes
   #environment
-= generate_problem_ical(@problem.notices.order_by(:created_at.asc))
+= generate_problem_ical(problem.notices.order_by(:created_at.asc))
 #nav-bar
   %ul
-    //%li= link_to 'Dashboard', admin_dashboard_path, :class => active_if_here(:dashboards)
-    %li.apps{:class => active_if_here(:apps)}= link_to 'Apps', apps_path
-    %li.errs{:class => active_if_here(:problems)}= link_to 'Errors', problems_path
+    %li.apps{:class => active_if_here(:apps)}= link_to t('.apps'), apps_path
+    %li.errs{:class => active_if_here(:problems)}= link_to t('.errors'), problems_path
     - if user_signed_in? && current_user.admin?
-      %li.users{:class => active_if_here(:users)}= link_to 'Users', users_path
+      %li.users{:class => active_if_here(:users)}= link_to t('.users'), users_path
   %div.clear
 - if current_user
   %ul#session-links
-    %li= link_to 'Sign out', destroy_session_path(:user), :id => 'sign-out'
-    %li= link_to 'Edit profile', edit_user_path(current_user), :id => 'edit-profile'
 \ No newline at end of file
+    %li= link_to t('.sign_out'), destroy_session_path(:user), :id => 'sign-out', :method => :delete
+    %li= link_to t('.edit_profile'), edit_user_path(current_user), :id => 'edit-profile'
-= errors_for @user
+= errors_for user
 .required
   = f.label :name
-- content_for :title, "Edit #{@user.name}"
+- content_for :title, "Edit #{user.name}"
 - content_for :action_bar do
-  = render 'shared/link_github_account', :user => @user
-  = link_to('cancel', user_path(@user), :class => 'button')
+  = render 'shared/link_github_account', :user => user
+  = link_to('cancel', user_path(user), :class => 'button')
-= form_for @user, :html => {:autocomplete => "off"} do |f|
-  = @user.errors.full_messages.to_sentence
+= form_for user, :html => {:autocomplete => "off"} do |f|
+  = user.errors.full_messages.to_sentence
   = render 'fields', :f => f
   %div.buttons= f.submit 'Update User'
@@ -13,8 +13,8 @@
       %th.main Email
       %th Admin?
   %tbody
-    - @users.each do |user|
-      %tr
+    - users.each do |user|
+      %tr.user_list
         - if Errbit::Config.use_gravatar
           %td= gravatar_tag user.email, :s => 24
         %td.nowrap= link_to user.name, user_path(user)
@@ -22,5 +22,5 @@
           %td= user.username
         %td= user.email
         %td= user.admin? ? 'Y' : 'N'
-= paginate @users
+= paginate users
 - content_for :title, 'New User'
 - content_for :action_bar, link_to('cancel', users_path, :class => 'button')
-= form_for @user do |f|
-  
+= form_for user do |f|
+
   = render 'fields', :f => f
-    
-  %div.buttons= f.submit 'Add User'
 \ No newline at end of file
+
+  %div.buttons= f.submit 'Add User'
-- content_for :title, @user.name
-- if Errbit::Config.use_gravatar
+- content_for :title, user.name
+
+- if Errbit::Config.use_gravatar && gravatar = gravatar_url(user.email, :s => 86)
   - content_for :title_style do
-    background: url('#{gravatar_url @user.email, :s => 86}') no-repeat;
+    background: url('#{gravatar}') no-repeat;
     padding-left: 106px;
 - content_for :action_bar do
-  = render 'shared/link_github_account', :user => @user
+  = render 'shared/link_github_account'
   %span= link_to('Add a New User', new_user_path, :class => 'add')
-  = link_to 'edit', edit_user_path(@user), :class => 'button'
-  = link_to 'destroy', user_path(@user), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
+  = link_to 'edit', edit_user_path(user), :class => 'button'
+  = link_to 'destroy', user_path(user), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
 %table.single_user
   %tr
     %th Email
-    %td.main= @user.email
+    %td.main= user.email
   - if Errbit::Config.user_has_username
     %tr
       %th Username
-      %td.main= @user.username
-  - if Errbit::Config.github_authentication && @user.github_login.present?
+      %td.main= user.username
+  - if Errbit::Config.github_authentication && user.github_login.present?
     %tr
       %th GitHub Login
-      %td.main= link_to @user.github_login, "https://github.com/#{@user.github_login}"
+      %td.main= link_to user.github_login, "https://github.com/#{user.github_login}"
   %tr
     %th Admin?
-    %td= @user.admin? ? 'Y' : 'N'
+    %td= user.admin? ? 'Y' : 'N'
   %tr
     %th Created
-    %td= @user.created_at.to_s(:micro)
+    %td= user.created_at.to_s(:micro)
 # This file is used by Rack-based servers to start the application.
 require ::File.expand_path('../config/environment',  __FILE__)
+use Rack::Deflater
 run Errbit::Application
@@ -48,11 +48,14 @@ module Errbit
       g.fixture_replacement :fabrication
     end
+    # Enable the mongoid identity map for performance
+    Mongoid.identity_map_enabled = true
+
     # IssueTracker subclasses use inheritance, so preloading models provides querying consistency in dev mode.
     config.mongoid.preload_models = true
     # Set up observers
-    config.mongoid.observers = :deploy_observer, :notice_observer
+    config.mongoid.observers = :deploy_observer, :comment_observer
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
@@ -27,6 +27,15 @@ per_app_email_at_notices: false
 # an email notification.
 email_at_notices: [1, 10, 100]
+# If you turn on this option, notify_at_notices can be
+# configured on a per app basis, at the App edit page
+per_app_notify_at_notices: false
+
+# Configure when emails are sent for an error.
+# [1,3,7] = 1st, 3rd, and 7th occurence triggers
+# [0] for all notices, provided notification service is configured
+notify_at_notices: [0]
+
 # Configure whether or not the user should be prompted before resolving an error.
 confirm_resolve_err: true
@@ -39,6 +48,12 @@ user_has_username: false
 # but you want to leave a short comment.
 allow_comments_with_issue_tracker: true
+# Display internal errors in production
+# Since this is an internal application, you might like to see what caused Errbit to crash.
+# Pull requests are always welcome!
+# However, you might be more comfortable setting this to false if your server can be accessed by anyone.
+display_internal_errors: true
+
 # Enable Gravatar.
 use_gravatar: true
 # Default Gravatar image, can be: mm, identicon, monsterid, wavatar, retro.
@@ -51,6 +66,7 @@ deployment:
     app: errbit.example.com
     db: errbit.example.com
   repository: http://github.com/errbit/errbit.git
+  branch: master
   user: deploy
   deploy_to: /var/www/apps/errbit
   # setup path to unicorn pids folder (or deploy_to/shared/pids will be used)
@@ -86,3 +102,8 @@ github_access_scope: [&#39;repo&#39;]
 #  :user_name:            USERNAME
 #  :password:             PASSWORD
+
+# If you want send your email by your sendmail
+# sendmail_settings:
+#  :location: '/usr/sbin/sendmail'
+#  :arguments: '-i -t'
@@ -35,10 +35,9 @@ set :copy_compression, :bz2
 set :scm, :git
 set :scm_verbose, true
-set(:current_branch) { `git branch`.match(/\* (\S+)\s/m)[1] || raise("Couldn't determine current branch") }
-set :branch, defer { current_branch }
+set :branch, config['branch'] || 'master'
-after 'deploy:update_code', 'errbit:symlink_configs'
+before 'deploy:assets:symlink', 'errbit:symlink_configs'
 # if unicorn is started through something like runit (the tool which restarts the process when it's stopped)
 # after 'deploy:restart', 'unicorn:stop'
@@ -56,6 +55,12 @@ namespace :errbit do
     run "mkdir -p #{shared_configs}"
     run "if [ ! -f #{shared_configs}/config.yml ]; then cp #{latest_release}/config/config.example.yml #{shared_configs}/config.yml; fi"
     run "if [ ! -f #{shared_configs}/mongoid.yml ]; then cp #{latest_release}/config/mongoid.example.yml #{shared_configs}/mongoid.yml; fi"
+
+    # Generate unique secret token
+    run %Q{if [ ! -f #{shared_configs}/secret_token.rb ]; then
+      cd #{current_release};
+      echo "Errbit::Application.config.secret_token = '$(bundle exec rake secret)'" > #{shared_configs}/secret_token.rb;
+    fi}.compact
   end
   task :symlink_configs do
@@ -64,6 +69,7 @@ namespace :errbit do
     release_configs = File.join(release_path,'config')
     run("ln -nfs #{shared_configs}/config.yml #{release_configs}/config.yml")
     run("ln -nfs #{shared_configs}/mongoid.yml #{release_configs}/mongoid.yml")
+    run("ln -nfs #{shared_configs}/secret_token.rb #{release_configs}/initializers/secret_token.rb")
   end
 end
-# Load the rails application
-require File.expand_path('../application', __FILE__)
 if RUBY_VERSION.to_f >= 1.9
   require 'yaml'
   YAML::ENGINE.yamler = 'syck'
 end
+
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
 # Initialize the rails application
 Errbit::Application.initialize!
-
@@ -14,7 +14,7 @@ Errbit::Application.configure do
   config.action_controller.perform_caching = false
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.raise_delivery_errors = false
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
   # Print deprecation notices to the Rails logger
@@ -5,8 +5,8 @@ Errbit::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
-  # Full error reports are enabled, since this is an internal application.
-  config.consider_all_requests_local       = true
+  # Shows or hides all error details if something goes wrong inside Errbit
+  config.consider_all_requests_local       = false
   # Caching is turned on
   config.action_controller.perform_caching = true
@@ -59,5 +59,6 @@ Errbit::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+  config.static_cache_control = "public, max-age=7200"
 end
@@ -4,15 +4,17 @@ default_config_file = Rails.root.join(&quot;config&quot;, &quot;config.example.yml&quot;)
 # Allow a Rails Engine to override config by defining it earlier
 unless defined?(Errbit::Config)
   Errbit::Config = OpenStruct.new
+  use_env = ENV['HEROKU'] || ENV['USE_ENV']
   # If Errbit is running on Heroku, config can be set from environment variables.
-  if ENV['HEROKU']
+  if use_env
     Errbit::Config.host = ENV['ERRBIT_HOST']
     Errbit::Config.email_from = ENV['ERRBIT_EMAIL_FROM']
-    Errbit::Config.email_at_notices = ENV['ERRBIT_EMAIL_AT_NOTICES']
-    Errbit::Config.confirm_resolve_err = ENV['ERRBIT_CONFIRM_RESOLVE_ERR']
-    Errbit::Config.user_has_username = ENV['ERRBIT_USER_HAS_USERNAME']
-    Errbit::Config.allow_comments_with_issue_tracker = ENV['ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER']
+    #  Not really easy to use like an env because need an array and ENV return a string :(
+    # Errbit::Config.email_at_notices = ENV['ERRBIT_EMAIL_AT_NOTICES']
+    Errbit::Config.confirm_resolve_err = ENV['ERRBIT_CONFIRM_RESOLVE_ERR'].to_i == 0
+    Errbit::Config.user_has_username = ENV['ERRBIT_USER_HAS_USERNAME'].to_i == 1
+    Errbit::Config.allow_comments_with_issue_tracker = ENV['ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER'].to_i == 0
     Errbit::Config.enforce_ssl = ENV['ERRBIT_ENFORCE_SSL']
     Errbit::Config.use_gravatar = ENV['ERRBIT_USE_GRAVATAR']
@@ -24,12 +26,12 @@ unless defined?(Errbit::Config)
     Errbit::Config.github_access_scope = ENV['GITHUB_ACCESS_SCOPE'].split(',').map(&:strip) if ENV['GITHUB_ACCESS_SCOPE']
     Errbit::Config.smtp_settings = {
-      :address        => "smtp.sendgrid.net",
-      :port           => "25",
+      :address        => ENV['SMTP_SERVER'] || 'smtp.sendgrid.net',
+      :port           => ENV['SMTP_PORT']   || 25,
       :authentication => :plain,
-      :user_name      => ENV['SENDGRID_USERNAME'],
-      :password       => ENV['SENDGRID_PASSWORD'],
-      :domain         => ENV['SENDGRID_DOMAIN']
+      :user_name      => ENV['SMTP_USERNAME']   || ENV['SENDGRID_USERNAME'],
+      :password       => ENV['SMTP_PASSWORD']   || ENV['SENDGRID_PASSWORD'],
+      :domain         => ENV['SMTP_DOMAIN'] || ENV['SENDGRID_DOMAIN'] || ENV['ERRBIT_EMAIL_FROM'].split('@').last
     }
   end
@@ -44,7 +46,7 @@ unless defined?(Errbit::Config)
       Errbit::Config.send("#{k}=", v)
     end
   # Show message if we are not running tests, not running on Heroku, and config.yml doesn't exist.
-  elsif not ENV['HEROKU']
+  elsif not use_env
     puts "Please copy 'config/config.example.yml' to 'config/config.yml' and configure your settings. Using default settings."
   end
@@ -69,8 +71,16 @@ if smtp = Errbit::Config.smtp_settings
   ActionMailer::Base.smtp_settings = smtp
 end
+if sendmail = Errbit::Config.sendmail_settings
+  ActionMailer::Base.delivery_method = :sendmail
+  ActionMailer::Base.sendmail_settings = sendmail
+end
+
 # Set config specific values
 (ActionMailer::Base.default_url_options ||= {}).tap do |default|
   default.merge! :host => Errbit::Config.host if default[:host].blank?
 end
+if Rails.env.production?
+  Rails.application.config.consider_all_requests_local = Errbit::Config.display_internal_errors
+end
@@ -0,0 +1,3 @@
+ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::YAML)
+ActiveSupport::XmlMini::PARSING.delete("symbol") 
+ActiveSupport::XmlMini::PARSING.delete("yaml") 
-# Use this hook to configure devise mailer, warden hooks and so forth. The first
-# four configuration values can also be set straight in your models.
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = Errbit::Config.email_from
   # Configure the class responsible to send e-mails.
@@ -15,69 +16,131 @@ Devise.setup do |config|
   require 'devise/orm/mongoid'
   # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating an user. By default is
+  # Configure which keys are used when authenticating a user. The default is
   # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating an user, both parameters are required. Remember that those
+  # authenticating a user, both parameters are required. Remember that those
   # parameters are used only when authenticating and not when retrieving from
   # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
   config.authentication_keys = [ Errbit::Config.user_has_username ? :username : :email ]
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [ Errbit::Config.user_has_username ? :username : :email ]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ Errbit::Config.user_has_username ? :username : :email ]
+
   # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
   # config.params_authenticatable = true
-  # Tell if authentication through HTTP Basic Auth is enabled. True by default.
-  # config.http_authenticatable = true
-
-  # Set this to true to use Basic Auth for AJAX requests.  True by default.
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:token]` will
+  # enable it only for token authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # :token         = Support basic authentication with token authentication key
+  # :token_options = Support token authentication with options as defined in
+  #                  http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
+  # config.http_authenticatable = false
+
+  # If http headers should be returned for AJAX requests. True by default.
   # config.http_authenticatable_on_xhr = true
-  # The realm used in Http Basic Authentication
+  # The realm used in Http Basic Authentication. "Application" by default.
   # config.http_authentication_realm = "Application"
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # :http_auth and :token_auth by adding those symbols to the array below.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
-  config.stretches = 10
-
-  # Define which will be the encryption algorithm. Devise also supports encryptors
-  # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
-  # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
-  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments.
+  config.stretches = Rails.env.test? ? 1 : 10
   # Setup a pepper to generate the encrypted password.
   config.pepper = "425f10f555c1a4718aff3370ef9dd2d97a21622beb0400fde6b52177375ddcbe37a2dac6af9bca835c988e00c32887ee940ba111a78eab48234d8799936d36b9"
   # ==> Configuration for :confirmable
-  # The time you want to give your user to confirm his account. During this time
-  # he will be able to access your application without confirming. Default is nil.
-  # When confirm_within is zero, the user won't be able to sign in without confirming.
-  # You can use this to let your user access some features of your application
-  # without confirming the account, but blocking it after a certain period
-  # (ie 2 days).
-  # config.confirm_within = 2.days
+  # A period that the user is allowed to access the website even without
+  # confirming his account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming his account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming his account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed new email is stored in
+  # unconfirmed email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   config.remember_for = 2.weeks
-  # If true, a valid remember token can be re-used between multiple browsers.
-  # config.remember_across_browsers = true
-
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
+  # Options to be passed to the created cookie. For instance, you can set
+  # :secure => true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
   # ==> Configuration for :validatable
-  # Range for password length
-  config.password_length = 6..20
+  # Range for password length. Default is 8..128.
+  config.password_length = 6..1024
-  # Regex to use to validate the email address
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
   config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again.
-  # config.timeout_in = 10.minutes
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # If true, expires auth token on session timeout.
+  # config.expire_auth_token_on_timeout = false
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.
@@ -85,6 +148,9 @@ Devise.setup do |config|
   # :none            = No lock strategy. You should handle locking by yourself.
   # config.lock_strategy = :failed_attempts
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
   # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
@@ -99,6 +165,26 @@ Devise.setup do |config|
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
   config.token_authentication_key = :auth_token
@@ -107,45 +193,63 @@ Devise.setup do |config|
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  # config.scoped_views = true
+  # config.scoped_views = false
   # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes.
+  # devise role declared in your routes (usually :user).
   # config.default_scope = :user
-  # Configure sign_out behavior.
-  # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
-  # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
-  # config.sign_out_all_scopes = false
-
-  if Errbit::Config.github_authentication || Rails.env.test?
-    config.omniauth :github,
-                    Errbit::Config.github_client_id,
-                    Errbit::Config.github_secret,
-                    :scope => Errbit::Config.github_access_scope.join(","),
-                    :skip_info => true
-  end
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like
   # :html, should redirect to the sign in page when the user does not have
   # access, but formats like :xml or :json, should return 401.
+  #
   # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists. Default is [:html]
-  # config.navigational_formats = [:html, :iphone]
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ["*/*", :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+
+  if Errbit::Config.github_authentication || Rails.env.test?
+    config.omniauth :github,
+      Errbit::Config.github_client_id,
+      Errbit::Config.github_secret,
+      :scope => Errbit::Config.github_access_scope.join(','),
+      :skip_info => true
+  end
   # ==> Warden configuration
-  # If you want to use other strategies, that are not (yet) supported by Devise,
-  # you can configure them inside the config.warden block. The example below
-  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
   #
   # config.warden do |manager|
-  #   manager.oauth(:twitter) do |twitter|
-  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
-  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
-  #     twitter.options :site => 'http://twitter.com'
-  #   end
-  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
-end
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: "/my_engine"
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = "/my_engine/users/auth"
+end
@@ -1,2 +0,0 @@
-InheritedResources.flash_keys = [:success, :error]
-
-if mongo = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL']
-  settings = URI.parse(mongo)
-  database_name = settings.path.gsub(/^\//, '')
+# Some code extract from Mongoid gem
+config_file = Rails.root.join("config", "mongoid.yml")
+if config_file.file? &&
+  YAML.load(ERB.new(File.read(config_file)).result)[Rails.env].values.flatten.any?
+  ::Mongoid.load!(config_file)
+elsif ENV['HEROKU'] || ENV['USE_ENV']
+  # No mongoid.yml file. Use ENV variable to define your MongoDB
+  # configuration
+  if mongo = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL'] || ENV['MONGODB_URL']
+    settings = URI.parse(mongo)
+    database_name = settings.path.gsub(/^\//, '')
+  else
+    settings = OpenStruct.new({
+      :host => ENV['MONGOID_HOST'],
+      :port => ENV['MONGOID_PORT'],
+      :user => ENV['MONGOID_USERNAME'],
+      :password => ENV['MONGOID_PASSWORD']
+    })
+    database_name = ENV['MONGOID_DATABASE']
+  end
   Mongoid.configure do |config|
-    config.master = Mongo::Connection.new(settings.host, settings.port).db(database_name)
-    config.master.authenticate(settings.user, settings.password) if settings.user
-    config.allow_dynamic_fields = false
-    config.use_activesupport_time_zone = true
+
+    hash = {
+      sessions: {
+        default: {
+          database: database_name,
+          hosts: [ "#{settings.host}:#{settings.port}" ]
+        }
+      },
+    }
+
+    if settings.user && settings.password
+      hash[:sessions][:default][:username] = settings.user
+      hash[:sessions][:default][:password] = settings.password
+    end
+
+    config.load_configuration(hash)
   end
 end
+Mongoid.allow_dynamic_fields = false
+Mongoid.use_activesupport_time_zone = true
+Mongoid.identity_map_enabled = true
@@ -4,5 +4,33 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Errbit::Application.config.secret_token = '6b74778101638fa9c156b3928c9492fb2481ab842538bea838d21f9c9993f649f5806449584266d413d0b2f1104162b3066a86512ed71ededd627cd41f939614'
+# Everyone can share the same token for development/test
+if %w(development test).include? Rails.env
+  Errbit::Application.config.secret_token = 'f258ed69266dc8ad0ca79363c3d2f945c388a9c5920fc9a1ae99a98fbb619f135001c6434849b625884a9405a60cd3d50fc3e3b07ecd38cbed7406a4fccdb59c'
+else
+
+  if ENV['SECRET_TOKEN'].present?
+    Errbit::Application.config.secret_token = ENV['SECRET_TOKEN']
+
+  # Do not raise an error if secret token is not available during assets precompilation
+  elsif ENV['RAILS_GROUPS'] != 'assets'
+    raise <<-ERROR
+
+  You must generate a unique secret token for your Errbit instance.
+
+  If you are deploying via capistrano, please ensure that your `config/deploy.rb` contains
+  the new `errbit:setup_configs` and `errbit:symlink_configs` tasks from `config/deploy.example.rb`.
+  Next time you deploy, your secret token will be automatically generated.
+
+  If you are deploying to Heroku, please run the following command to set your secret token:
+      heroku config:add SECRET_TOKEN="$(bundle exec rake secret)"
+
+  If you are deploying in some other way, please run the following command to generate a new secret token,
+  and commit the new `config/initializers/secret_token.rb`:
+
+      echo "Errbit::Application.config.secret_token = '$(bundle exec rake secret)'" > config/initializers/secret_token.rb
+
+  ERROR
+  end
+end
-#
 # Enforce SSL connections, if configured
 if Errbit::Config.enforce_ssl
+  require 'rack/ssl-enforcer'
+  ActionMailer::Base.default_url_options.merge!(:protocol => 'https://')
   Errbit::Application.configure do
     config.middleware.use Rack::SslEnforcer, :except => /^\/deploys/
   end
@@ -2,7 +2,6 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
-  hello: "Hello world"
   flash:
     apps:
       create:
@@ -11,6 +10,71 @@ en:
         success: "Good news everyone! '%{app_name}' was successfully updated."
       destroy:
         success: "'%{app_name}' was successfully destroyed."
+
   n_errs_have:
     one:   "%{count} err has"
     other: "%{count} errs have"
+
+  layouts:
+    application:
+      title: 'Errbit'
+      errbit: 'Errbit'
+      powered_html: "Powered by %{link} : the open source error catcher."
+
+  shared:
+    navigation:
+      apps: 'Apps'
+      errors: 'Errors'
+      users: 'Users'
+    session:
+      sign_out: 'Sign out'
+      edit_profile: 'Edit profile'
+
+  controllers:
+    apps:
+      flash:
+        create:
+          success: "Your app was successfully created."
+          error:  "You app was successfully destroyed."
+        update:
+          success: "You app was successfully updated."
+          error: "You app was not updated"
+        destroy:
+          success: "You app was successfully destroyed."
+          error: "You app could not be destroyed."
+
+    users:
+      flash:
+        destroy:
+          success: "That's sad. %{name} is no longer part of your team."
+          error: "You can't delete yourself"
+        update:
+          success: "%{name}'s information was successfully updated."
+    problems:
+      flash:
+        no_select_problem: "You have not selected any errors"
+        need_two_errors_merge: "You must select at least two errors to merge"
+        merge_several:
+          success: "%{nb} errors have been merged."
+
+  devise:
+    registrations:
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+
+  apps:
+    index:
+      notify: Notification Service
+      tracker: Tracker
+      last_deploy: Last Deploy
+      errors: Errors
+      name: Name
+      repository: Repository
+      title: Apps
+      new_app: Add a New App
+      no_apps: 'No apps here.'
+      click_to_create: 'Click here to create your first one'
@@ -7,27 +7,34 @@
 # `cap deploy:setup` is ran the first time. Be sure
 # to place production specific settings there
-defaults: &defaults
-  host: localhost
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
-
 development:
-  <<: *defaults
-  database: errbit_development
+  sessions:
+    default:
+      database: errbit_development
+      hosts:
+        - localhost:27017
+  options:
+    identity_map_enabled: true
+    use_utc: true
 test:
-  <<: *defaults
-  database: errbit_test
+  sessions:
+    default:
+      hosts:
+        - localhost:27017
+      database: errbit_test
+  options:
+    identity_map_enabled: true
+    use_utc: true
 # set these environment variables on your prod server
 production:
-  <<: *defaults
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
+  sessions:
+    default:
+      database: <%= ENV['MONGOID_DATABASE'] %>
+      hosts:
+        - <%=ENV["MONGOID_HOST"]%><%=ENV["MONGOID_PORT"]%>
+      username: <%= ENV['MONGOID_USERNAME'] %>
+      password: <%= ENV['MONGOID_PASSWORD'] %>
+  options:
+    identity_map_enabled: true
@@ -5,4 +5,6 @@
 # commit it to your repo, then push to heroku.
 production:
-  uri: <%= ENV['MONGOHQ_URL'] %>
+  sessions:
+    default:
+      uri: <%= ENV['MONGOHQ_URL'] %>
@@ -5,4 +5,6 @@
 # commit it to your repo, then push to heroku.
 production:
-  uri: <%= ENV['MONGOLAB_URI'] %>
+  sesssions:
+    default:
+      uri: <%= ENV['MONGOLAB_URI'] %>
@@ -21,7 +21,7 @@ Errbit::Application.routes.draw do
       post :unresolve_several
       post :merge_several
       post :unmerge_several
-      get :all
+      get :search
     end
   end
@@ -44,7 +44,12 @@ Errbit::Application.routes.draw do
   namespace :api do
     namespace :v1 do
       resources :problems, :only => [:index], :defaults => { :format => 'json' }
-      resources :notices, :only => [:index], :defaults => { :format => 'json' }
+      resources :notices,  :only => [:index], :defaults => { :format => 'json' }
+      resources :stats, :only => [], :defaults => { :format => 'json' } do
+        collection do
+          get :app
+        end
+      end
     end
   end
@@ -3,3 +3,27 @@
 worker_processes 3 # amount of unicorn workers to spin up
 timeout 30         # restarts workers that hang for 30 seconds
 preload_app true
+
+# Taken from github: https://github.com/blog/517-unicorn
+# Though everyone uses pretty miuch the same code
+before_fork do |server, worker|
+  ##
+  # When sent a USR2, Unicorn will suffix its pidfile with .oldbin and
+  # immediately start loading up a new version of itself (loaded with a new
+  # version of our app). When this new Unicorn is completely loaded
+  # it will begin spawning workers. The first worker spawned will check to
+  # see if an .oldbin pidfile exists. If so, this means we've just booted up
+  # a new Unicorn and need to tell the old one that it can now die. To do so
+  # we send it a QUIT.
+  #
+  # Using this method we get 0 downtime deploys.
+ 
+  old_pid = "#{server.config[:pid]}.oldbin"
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+      # someone else did our job for us
+    end
+  end
+end
 class MoveNoticesToSeparateCollection < Mongoid::Migration
   def self.up
+    errs_coll = connection["errs"]
+
     # copy embedded Notices into a separate collection
-    mongo_db = Err.db
-    errs = mongo_db.collection("errs").find({ }, :fields => ["notices"])
+    errs = errs_coll.find.select(notices: 1)
     errs.each do |err|
       next unless err['notices']
@@ -18,7 +19,7 @@ class MoveNoticesToSeparateCollection &lt; Mongoid::Migration
         e.notices.create!(notice)
       end
       e.app.update_attribute(:notify_on_errs, old_notify)
-      mongo_db.collection("errs").update({ "_id" => err['_id']}, { "$unset" => { "notices" => 1}})
+      errs_coll.find({ "_id" => err['_id']}).update({ "$unset" => { "notices" => 1}})
     end
     Rake::Task["errbit:db:update_notices_count"].invoke
     Rake::Task["errbit:db:update_problem_attrs"].invoke
 class RenameKlassToErrorClass < Mongoid::Migration
   def self.up
     [Problem, Err, Notice].each do |model|
-      model.collection.update({}, {'$rename' => {'klass' => 'error_class'}}, :multi => true, :safe => true)
+      model.collection.find.update({'$rename' => {'klass' => 'error_class'}}, :multi => true, :safe => true)
     end
   end
   def self.down
     [Problem, Err, Notice].each do |model|
-      model.collection.update({}, {'$rename' => {'error_class' => 'klass'}}, :multi => true, :safe => true)
+      model.collection.find.update({'$rename' => {'error_class' => 'klass'}}, :multi => true, :safe => true)
     end
   end
 end
 class ChangeGithubUrlToGithubRepo < Mongoid::Migration
   def self.up
-    App.collection.update({}, {'$rename' => {'github_url' => 'github_repo'}}, :multi => true, :safe => true)
+    App.collection.find.update({'$rename' => {'github_url' => 'github_repo'}}, :multi => true, :safe => true)
     App.all.each do |app|
       app.send :normalize_github_repo
       app.save
@@ -8,7 +8,7 @@ class ChangeGithubUrlToGithubRepo &lt; Mongoid::Migration
   end
   def self.down
-    App.collection.update({}, {'$rename' => {'github_repo' => 'github_url'}}, :multi => true, :safe => true)
+    App.collection.find.update({'$rename' => {'github_repo' => 'github_url'}}, :multi => true, :safe => true)
     App.all.each do |app|
       unless app.github_repo.include?("github.com")
         app.update_attribute :github_url, "https://github.com/" << app.github_url
@@ -2,7 +2,8 @@ class ExtractBacktraces &lt; Mongoid::Migration
   def self.up
     say "It could take long time (hours if you have many Notices)"
     Notice.unscoped.all.each do |notice|
-      backtrace = Backtrace.find_or_create(:raw => notice['backtrace'])
+      next if notice.backtrace.present? || notice['backtrace'].nil?
+      backtrace = Backtrace.find_or_create(:raw => notice['backtrace'] || [])
       notice.backtrace = backtrace
       notice['backtrace'] = nil
       notice.save!
@@ -12,4 +13,4 @@ class ExtractBacktraces &lt; Mongoid::Migration
   def self.down
   end
 -end
+end
 \ No newline at end of file
 class RegenerateErrFingerprints < Mongoid::Migration
   def self.up
     Err.all.each do |err|
-      fingerprint_source = {
-        :backtrace   => err.notices.first.backtrace_id,
-        :error_class => err.error_class,
-        :component   => err.component,
-        :action      => err.action,
-        :environment => err.environment,
-        :api_key     => err.app.api_key
-      }
-      fingerprint = Digest::SHA1.hexdigest(fingerprint_source.to_s)
-      err.update_attribute(:fingerprint, fingerprint)
+      if err.notices.any?
+        fingerprint_source = {
+          :backtrace   => err.notices.first.backtrace_id,
+          :error_class => err.error_class,
+          :component   => err.component,
+          :action      => err.action,
+          :environment => err.environment,
+          :api_key     => err.app.api_key
+        }
+        fingerprint = Digest::SHA1.hexdigest(fingerprint_source.to_s)
+        err.update_attribute(:fingerprint, fingerprint)
+      end
     end
   end
@@ -0,0 +1,17 @@
+class AllowCustomXmppOnGtalk < Mongoid::Migration
+  def self.up
+    App.all.each do |app|
+      if app.notification_service and app.notification_service._type.include?("Gtalk")
+        user_id = app.notification_service.room_id
+        app.notification_service.update_attributes(:service => 'talk.google.com',
+                                                   :service_url => "http://www.google.com/talk/",
+                                                   :user_id => user_id,
+                                                   :room_id => nil)
+                                                   
+      end
+    end
+  end
+
+  def self.down
+  end
+end
@@ -0,0 +1,12 @@
+class AddIntervalFieldForNotifications < Mongoid::Migration
+  def self.up
+    App.all.each do |app|
+      if app.notification_service
+        app.notification_service.update_attributes(:notify_at_notices => [0])
+      end
+    end
+  end
+
+  def self.down
+  end
+end
@@ -12,12 +12,11 @@ puts &quot;-- email:    #{admin_email}&quot;
 puts "-- password: #{admin_pass}"
 puts ""
 puts "Be sure to change these credentials ASAP!"
-user = User.where(:email => admin_email).first || User.new({
-  :name                   => 'Errbit Admin',
-  :email                  => admin_email,
-  :password               => admin_pass,
-  :password_confirmation  => admin_pass
-})
+user = User.find_or_initialize_by(:email => admin_email) do |u|
+  u.name = 'Errbit Admin'
+  u.password = admin_pass
+  u.password_confirmation = admin_pass
+end
 user.username = admin_username if Errbit::Config.user_has_username
 user.admin = true
@@ -0,0 +1,22 @@
+# Some Tips to help you when you develop on Errbit
+
+## Running spec on multi-threaded mode
+
+Running the complete test suite can be really long. You can running it
+on multi-fork system with the wonderfull gem of
+[@tmm1](http://github.com/tmm1), [test-queue](http://github.com/tmm1/test-queue)
+
+If you want do it, you need install in first the gem 'test-queue'
+
+```
+gem install test-queue
+```
+
+After you just need launch the script with adapting runner of mongoid.
+
+```
+./script/rspec-queue-mongoid.rb spec
+```
+
+In my case, the complete test suite down to 2min after a 16min long
+before.
@@ -0,0 +1,77 @@
+# Which env variable you can use ?
+
+Errbit can be almost configured by some ENVIRONMENT variables. If you
+use this variable, you don't need copy all of you configuration file
+
+To activate this env variable you need activate it by a Variable env.
+You can do that with HEROKU or USE_ENV variable
+
+If you activate it you can use all of this env variable :
+
+## Errbit base configuration
+
+* ERRBIT_HOST : the host of your errbit instance (not define by default)
+* ERRBIT_EMAIL_FROM : the email sending all of your notification (not
+  define by default )
+* ERRBIT_CONFIRM_RESOLVE_ERR : define if you need confirm when you mark
+  a problem resolve. ( true by default, fill it and you not need
+confirm )
+* ERRBIT_USER_HAS_USERNAME : allow identify your user by username
+  instead of email. ( false by default, set to '1' to activate it)
+* ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER : define if you activate the
+  comment or not. By default comment are
+* ERRBIT_ENFORCE_SSL : allow force the ssl on all the application. By
+  default is false
+* ERRBIT_USE_GRAVATAR : allow use gravatar to see user gravatar in user
+  comment and page
+
+## Authentification configuration
+
+Environement variable allow define how you can auth on your errbit
+
+### Github authentification
+
+You can allow the GITHUB auth
+
+* GITHUB_AUTHENTIFICATION : define if you allow the github auth. By
+  default false
+* GITHUB_CLIENT_ID : you github app client id to use in your github auth
+* GITHUB_SECRET : your github app secret to use in your github auth
+* GITHUB_ACCESS_SCOPE : The scope to ask to access on github account
+
+## Email sending configuration
+
+You can define how you connect your email sending system By all of this
+information. All mail can be send only by SMTP if you use variable
+system
+
+* SMTP_SERVER
+* SMTP_PORT
+* SMTP_USERNAME
+* SMTP_PASSWORD
+* SMTP_DOMAIN
+
+## MongoDB
+
+You can define your MongoDB connection by 2 ways. If you have an URL,
+you can define one of this ENV variables. All independently can works
+
+* MONGOLAB_URI
+* MONGOHQ_URL
+
+If you have a complete MongoDB connection you can define it by all
+information associate to your MongoDB connection. You need define all
+variable.
+
+* MONGOID_HOST
+* MONGOID_PORT
+* MONGOID_USERNAME
+* MONGOID_PASSWORD
+* MONGOID_DATABASE
+
+## Flowdock notification adapter
+
+If you noticed default Gravatar icon in your Flowdock notifications you
+may want to [add Errbit icon](http://gravatar.com) for email that is
+set in ERRBIT_EMAIL_FROM.
+You don't need to approve or authorize it on Flowdock because it is used only for an icon.
@@ -0,0 +1,21 @@
+# Flowdock
+
+The flowdock notification send to [flowdock](https://www.flowdock.com/).
+
+## Configuration
+
+### Api token
+
+You need define the API token.
+It is purposely called Flow API Token and not Flowdock API Token to make
+it more obvious for user which one of the two tokens we expect:
+
+![flow token](flow_token_api.jpg)
+
+### Sender ( not configure )
+
+If you noticed default Gravatar icon in your Flowdock notifications you
+may want to [add Errbit icon](http://gravatar.com) for email that is
+set in ERRBIT_EMAIL_FROM.
+You don't need to approve or authorize it on Flowdock because it is
+used only for an icon.
@@ -0,0 +1,9 @@
+module Errbit::Version
+  MAJOR = 0
+  MINOR = 1
+  PATCH = 0
+
+  def self.to_s
+    "#{MAJOR}.#{MINOR}.#{PATCH}"
+  end
+end
@@ -3,7 +3,7 @@ require &#39;hoptoad/v2&#39;
 module Hoptoad
   class ApiVersionError < StandardError
     def initialize
-      super "Wrong API Version: Expecting 2.0, 2.1, 2.2 or 2.3"
+      super "Wrong API Version: Expecting 2.0, 2.1, 2.2, 2.3 or 2.4"
     end
   end
@@ -16,7 +16,7 @@ module Hoptoad
   private
     def self.get_version_processor(version)
       case version
-      when /2\.[0123]/; Hoptoad::V2
+      when /2\.[01234]/; Hoptoad::V2
       else;            raise ApiVersionError
       end
     end
@@ -18,6 +18,8 @@ module Hoptoad
           {normalize_key(node['key']) => rekey(node['__content__'])}
         elsif node.has_key?('__content__')
           rekey(node['__content__'])
+        elsif node.has_key?('key')
+          {normalize_key(node['key']) => nil}
         else
           node.inject({}) {|rekeyed, (key, val)| rekeyed.merge(normalize_key(key) => rekey(val))}
         end
@@ -59,10 +61,10 @@ module Hoptoad
         :api_key            => notice['api-key'],
         :notifier           => notice['notifier'],
-        :user_attributes    => notice['user-attributes'] || {},
-        :current_user       => notice['current-user'] || {}
+        # 'current-user' from airbrake, 'user-attributes' from airbrake_user_attributes gem
+        :user_attributes    => notice['current-user'] || notice['user-attributes'] || {},
+        :framework          => notice['framework']
       }
     end
   end
 end
-
@@ -6,7 +6,9 @@ namespace :errbit do
     desc "Updates cached attributes on Problem"
     task :update_problem_attrs => :environment do
       puts "Updating problems"
-      Problem.all.each(&:cache_notice_attributes)
+      Problem.all.each{|problem|
+        ProblemUpdaterCache.new(problem).update
+      }
     end
     desc "Updates Problem#notices_count"
@@ -19,9 +21,8 @@ namespace :errbit do
     desc "Delete resolved errors from the database. (Useful for limited heroku databases)"
     task :clear_resolved => :environment do
-      count = Problem.resolved.count
-      Problem.resolved.each {|problem| problem.destroy }
-      puts "=== Cleared #{count} resolved errors from the database." if count > 0
+      require 'resolved_problem_clearer'
+      puts "=== Cleared #{ResolvedProblemClearer.new.execute} resolved errors from the database."
     end
     desc "Regenerate fingerprints"
@@ -42,15 +42,15 @@ namespace :errbit do
     errors.each do |error_template|
       rand(34).times do
-
-        error_report = error_template.reverse_merge({
+        ErrorReport.new(error_template.reverse_merge({
+          :api_key => app.api_key,
           :error_class => "StandardError",
           :message => "Oops. Something went wrong!",
           :backtrace => random_backtrace,
           :request => {
-                        'component' => 'main',
-                        'action' => 'error'
-                      },
+            'component' => 'main',
+            'action' => 'error'
+          },
           :server_environment => {'environment-name' => Rails.env.to_s},
           :notifier => {:name => "seeds.rb"},
           :app_user => {
@@ -59,9 +59,7 @@ namespace :errbit do
             :name => "John Smith",
             :url => "http://www.example.com/users/jsmith"
           }
-        })
-
-        app.report_error!(error_report)
+        })).generate_notice!
       end
     end
-var Hoptoad = {
-  VERSION           : '2.0',
-  NOTICE_XML        : '<?xml version="1.0" encoding="UTF-8"?>\
-  <notice version="2.0">\
-    <api-key></api-key>\
-    <notifier>\
-      <name>errbit_notifier_js</name>\
-      <version>2.0</version>\
-      <url>https://github.com/errbit/errbit</url>\
-    </notifier>\
-    <error>\
-      <class>EXCEPTION_CLASS</class>\
-      <message>EXCEPTION_MESSAGE</message>\
-      <backtrace>BACKTRACE_LINES</backtrace>\
-    </error>\
-    <request>\
-      <url>REQUEST_URL</url>\
-      <component>REQUEST_COMPONENT</component>\
-      <action>REQUEST_ACTION</action>\
-    </request>\
-    <server-environment>\
-      <project-root>PROJECT_ROOT</project-root>\
-      <environment-name>production</environment-name>\
-    </server-environment>\
-  </notice>',
-  ROOT              : window.location.protocol + '//' + window.location.host,
-  BACKTRACE_MATCHER : /^(.*)\@(.*)\:(\d+)$/,
-  backtrace_filters : [/notifier\.js/],
-
-  notify: function(error) {
-    var xml     = escape(Hoptoad.generateXML(error));
-    var host    = Hoptoad.host;
-    var url     = '//' + host + '/notifier_api/v2/notices.xml?data=' + xml;
-    var request = document.createElement('iframe');
-
-    request.style.width   = '1px';
-    request.style.height  = '1px';
-    request.style.display = 'none';
-    request.src = url;
-
-    document.getElementsByTagName('head')[0].appendChild(request);
-  },
-
-  setEnvironment: function(value) {
-    var matcher = /<environment-name>.*<\/environment-name>/;
-
-    Hoptoad.NOTICE_XML  = Hoptoad.NOTICE_XML.replace(matcher,
-                                                     '<environment-name>' +
-                                                       value +
-                                                     '</environment-name>')
-  },
-
-  setHost: function(value) {
-    Hoptoad.host = value;
-  },
-
-  setKey: function(value) {
-    var matcher = /<api-key>.*<\/api-key>/;
-
-    Hoptoad.NOTICE_XML = Hoptoad.NOTICE_XML.replace(matcher,
-                                                    '<api-key>' +
-                                                      value +
-                                                    '</api-key>');
-  },
-
-  setErrorDefaults: function(value) {
-    Hoptoad.errorDefaults = value;
-  },
-
-  generateXML: function(errorWithoutDefaults) {
-    var error = Hoptoad.mergeDefault(Hoptoad.errorDefaults, errorWithoutDefaults);
-
-    var xml       = Hoptoad.NOTICE_XML;
-    var url       = Hoptoad.escapeText(error.url       || '');
-    var component = Hoptoad.escapeText(error.component || '');
-    var action    = Hoptoad.escapeText(error.action    || '');
-    var type      = Hoptoad.escapeText(error.type      || 'Error');
-    var message   = Hoptoad.escapeText(error.message   || 'Unknown error.');
-    var backtrace = Hoptoad.generateBacktrace(error);
-
-
-    if (Hoptoad.trim(url) == '' && Hoptoad.trim(component) == '') {
-      xml = xml.replace(/<request>.*<\/request>/, '');
-    } else {
-      var data    = '';
-
-      var cgi_data = error['cgi-data'] || {};
-      cgi_data["HTTP_USER_AGENT"] = navigator.userAgent;
-      data += '<cgi-data>';
-      data += Hoptoad.generateVariables(cgi_data);
-      data += '</cgi-data>';
-
-      var methods = ['params', 'session'];
-
-      for (var i = 0; i < methods.length; i++) {
-        var method = methods[i];
-
-        if (error[method]) {
-          data += '<' + method + '>';
-          data += Hoptoad.generateVariables(error[method]);
-          data += '</' + method + '>';
-        }
-      }
-
-      xml = xml.replace('</request>',        data + '</request>')
-               .replace('REQUEST_URL',       url)
-               .replace('REQUEST_ACTION',    action)
-               .replace('REQUEST_COMPONENT', component);
-    }
-
-    return xml.replace('PROJECT_ROOT',     Hoptoad.ROOT)
-              .replace('EXCEPTION_CLASS',   type)
-              .replace('EXCEPTION_MESSAGE', message)
-              .replace('BACKTRACE_LINES',   backtrace.join(''));
-  },
-
-  generateBacktrace: function(error) {
-    error = error || {};
-
-    if (typeof error.stack != 'string') {
-      try {
-        (0)();
-      } catch(e) {
-        error.stack = e.stack;
-      }
-    }
-
-    var backtrace  = [];
-    var stacktrace = Hoptoad.getStackTrace(error);
-
-    for (var i = 0, l = stacktrace.length; i < l; i++) {
-      var line    = stacktrace[i];
-      var matches = line.match(Hoptoad.BACKTRACE_MATCHER);
-
-      if (matches && Hoptoad.validBacktraceLine(line)) {
-        var file = matches[2].replace(Hoptoad.ROOT, '[PROJECT_ROOT]');
-
-        if (i == 0) {
-          if (matches[2].match(document.location.href)) {
-            backtrace.push('<line method="" file="internal: " number=""/>');
-          }
-        }
-
-        backtrace.push('<line method="' + Hoptoad.escapeText(matches[1]) +
-                       '" file="' + Hoptoad.escapeText(file) +
-                       '" number="' + matches[3] + '" />');
-      }
-    }
-
-    return backtrace;
-  },
-
-  getStackTrace: function(error) {
-    var stacktrace = printStackTrace({ e : error, guess : false });
-
-    for (var i = 0, l = stacktrace.length; i < l; i++) {
-      if (stacktrace[i].match(/\:\d+$/)) {
-        continue;
-      }
-
-      if (stacktrace[i].indexOf('@') == -1) {
-        stacktrace[i] += '@unsupported.js';
-      }
-
-      stacktrace[i] += ':0';
-    }
-
-    return stacktrace;
-  },
-
-  validBacktraceLine: function(line) {
-    for (var i = 0; i < Hoptoad.backtrace_filters.length; i++) {
-      if (line.match(Hoptoad.backtrace_filters[i])) {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  generateVariables: function(parameters) {
-    var key;
-    var result = '';
-
-    for (key in parameters) {
-      result += '<var key="' + Hoptoad.escapeText(key) + '">' +
-                  Hoptoad.escapeText(parameters[key]) +
-                '</var>';
-    }
-
-    return result;
-  },
-
-  escapeText: function(text) {
-    return text.replace(/&/g, '&#38;')
-               .replace(/</g, '&#60;')
-               .replace(/>/g, '&#62;')
-               .replace(/'/g, '&#39;')
-               .replace(/"/g, '&#34;');
-  },
-
-  trim: function(text) {
-    return text.toString().replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-
-  mergeDefault: function(defaults, hash) {
-    var cloned = {};
-    var key;
-
-    for (key in hash) {
-      cloned[key] = hash[key];
-    }
-
-    for (key in defaults) {
-      if (!cloned.hasOwnProperty(key)) {
-        cloned[key] = defaults[key];
-      }
-    }
-
-    return cloned;
-  }
-};
-
-
-
-
+// Airbrake JavaScript Notifier Bundle
+(function(window, document, undefined) {
 // Domain Public by Eric Wendelin http://eriwen.com/ (2008)
-//          Luke Smith http://lucassmith.name/ (2008)
-//          Loic Dachary <loic@dachary.org> (2008)
-//          Johan Euphrosine <proppy@aminche.com> (2008)
-//          Øyvind Sean Kinsey http://kinsey.no/blog (2010)
+//                  Luke Smith http://lucassmith.name/ (2008)
+//                  Loic Dachary <loic@dachary.org> (2008)
+//                  Johan Euphrosine <proppy@aminche.com> (2008)
+//                  Øyvind Sean Kinsey http://kinsey.no/blog (2010)
+//                  Victor Homyakov (2010)
 //
 // Information and discussions
 // http://jspoker.pokersource.info/skin/test-printstacktrace.html
 // http://eriwen.com/javascript/js-stack-trace/
 // http://eriwen.com/javascript/stacktrace-update/
 // http://pastie.org/253058
-// http://browsershots.org/http://jspoker.pokersource.info/skin/test-printstacktrace.html
-//
 //
 // guessFunctionNameFromLines comes from firebug
 //
@@ -270,24 +45,1135 @@ var Hoptoad = {
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 // IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-function printStackTrace(a){var b=a&&a.e?a.e:null;a=a?!!a.guess:true;var c=new printStackTrace.implementation;b=c.run(b);return a?c.guessFunctions(b):b}printStackTrace.implementation=function(){};
-printStackTrace.implementation.prototype={run:function(a){var b=this._mode||this.mode();if(b==="other")return this.other(arguments.callee);else{var c;if(!(c=a))a:{try{0()}catch(d){c=d;break a}c=void 0}a=c;return this[b](a)}},mode:function(){try{0()}catch(a){if(a.arguments)return this._mode="chrome";else if(a.stack)return this._mode="firefox";else if(window.opera&&!("stacktrace"in a))return this._mode="opera"}return this._mode="other"},chrome:function(a){return a.stack.replace(/^.*?\n/,"").replace(/^.*?\n/,
-"").replace(/^.*?\n/,"").replace(/^[^\(]+?[\n$]/gm,"").replace(/^\s+at\s+/gm,"").replace(/^Object.<anonymous>\s*\(/gm,"{anonymous}()@").split("\n")},firefox:function(a){return a.stack.replace(/^.*?\n/,"").replace(/(?:\n@:0)?\s+$/m,"").replace(/^\(/gm,"{anonymous}(").split("\n")},opera:function(a){a=a.message.split("\n");var b=/Line\s+(\d+).*?script\s+(http\S+)(?:.*?in\s+function\s+(\S+))?/i,c,d,e;c=4;d=0;for(e=a.length;c<e;c+=2)if(b.test(a[c]))a[d++]=(RegExp.$3?RegExp.$3+"()@"+RegExp.$2+RegExp.$1:
-"{anonymous}()@"+RegExp.$2+":"+RegExp.$1)+" -- "+a[c+1].replace(/^\s+/,"");a.splice(d,a.length-d);return a},other:function(a){for(var b=/function\s*([\w\-$]+)?\s*\(/i,c=[],d=0,e,f;a&&c.length<10;){e=b.test(a.toString())?RegExp.$1||"{anonymous}":"{anonymous}";f=Array.prototype.slice.call(a.arguments);c[d++]=e+"("+printStackTrace.implementation.prototype.stringifyArguments(f)+")";if(a===a.caller&&window.opera)break;a=a.caller}return c},stringifyArguments:function(a){for(var b=0;b<a.length;++b){var c=
-a[b];if(typeof c=="object")a[b]="#object";else if(typeof c=="function")a[b]="#function";else if(typeof c=="string")a[b]='"'+c+'"'}return a.join(",")},sourceCache:{},ajax:function(a){var b=this.createXMLHTTPObject();if(b){b.open("GET",a,false);b.setRequestHeader("User-Agent","XMLHTTP/1.0");b.send("");return b.responseText}},createXMLHTTPObject:function(){for(var a,b=[function(){return new XMLHttpRequest},function(){return new ActiveXObject("Msxml2.XMLHTTP")},function(){return new ActiveXObject("Msxml3.XMLHTTP")},
-function(){return new ActiveXObject("Microsoft.XMLHTTP")}],c=0;c<b.length;c++)try{a=b[c]();this.createXMLHTTPObject=b[c];return a}catch(d){}},getSource:function(a){a in this.sourceCache||(this.sourceCache[a]=this.ajax(a).split("\n"));return this.sourceCache[a]},guessFunctions:function(a){for(var b=0;b<a.length;++b){var c=a[b],d=/{anonymous}\(.*\)@(\w+:\/\/([-\w\.]+)+(:\d+)?[^:]+):(\d+):?(\d+)?/.exec(c);if(d){var e=d[1];d=d[4];if(e&&d){e=this.guessFunctionName(e,d);a[b]=c.replace("{anonymous}",e)}}}return a},
-guessFunctionName:function(a,b){try{return this.guessFunctionNameFromLines(b,this.getSource(a))}catch(c){return"getSource failed with url: "+a+", exception: "+c.toString()}},guessFunctionNameFromLines:function(a,b){for(var c=/function ([^(]*)\(([^)]*)\)/,d=/['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(function|eval|new Function)/,e="",f=0;f<10;++f){e=b[a-f]+e;if(e!==undefined){var g=d.exec(e);if(g&&g[1])return g[1];else if((g=c.exec(e))&&g[1])return g[1]}}return"(?)"}};
+/**
+ * Main function giving a function stack trace with a forced or passed in Error
+ *
+ * @cfg {Error} e The error to create a stacktrace from (optional)
+ * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
+ * @return {Array} of Strings with functions, lines, files, and arguments where possible
+ */
+function printStackTrace(options) {
+    options = options || {guess: true};
+    var ex = options.e || null, guess = !!options.guess;
+    var p = new printStackTrace.implementation(), result = p.run(ex);
+    return (guess) ? p.guessAnonymousFunctions(result) : result;
+}
+if (typeof module !== "undefined" && module.exports) {
+    module.exports = printStackTrace;
+}
-
-window.onerror = function(message, file, line) {
-  setTimeout(function() {
-    Hoptoad.notify({
-      message : message,
-      stack   : '()@' + file + ':' + line
-    });
-  }, 100);
-  return true;
+printStackTrace.implementation = function() {
 };
+printStackTrace.implementation.prototype = {
+    /**
+     * @param {Error} ex The error to create a stacktrace from (optional)
+     * @param {String} mode Forced mode (optional, mostly for unit tests)
+     */
+    run: function(ex, mode) {
+        ex = ex || this.createException();
+        // examine exception properties w/o debugger
+        //for (var prop in ex) {alert("Ex['" + prop + "']=" + ex[prop]);}
+        mode = mode || this.mode(ex);
+        if (mode === 'other') {
+            return this.other(arguments.callee);
+        } else {
+            return this[mode](ex);
+        }
+    },
+
+    createException: function() {
+        try {
+            this.undef();
+        } catch (e) {
+            return e;
+        }
+    },
+
+    /**
+     * Mode could differ for different exception, e.g.
+     * exceptions in Chrome may or may not have arguments or stack.
+     *
+     * @return {String} mode of operation for the exception
+     */
+    mode: function(e) {
+        if (e['arguments'] && e.stack) {
+            return 'chrome';
+        } else if (e.stack && e.sourceURL) {
+            return 'safari';
+        } else if (e.stack && e.number) {
+            return 'ie';
+        } else if (typeof e.message === 'string' && typeof window !== 'undefined' && window.opera) {
+            // e.message.indexOf("Backtrace:") > -1 -> opera
+            // !e.stacktrace -> opera
+            if (!e.stacktrace) {
+                return 'opera9'; // use e.message
+            }
+            // 'opera#sourceloc' in e -> opera9, opera10a
+            if (e.message.indexOf('\n') > -1 && e.message.split('\n').length > e.stacktrace.split('\n').length) {
+                return 'opera9'; // use e.message
+            }
+            // e.stacktrace && !e.stack -> opera10a
+            if (!e.stack) {
+                return 'opera10a'; // use e.stacktrace
+            }
+            // e.stacktrace && e.stack -> opera10b
+            if (e.stacktrace.indexOf("called from line") < 0) {
+                return 'opera10b'; // use e.stacktrace, format differs from 'opera10a'
+            }
+            // e.stacktrace && e.stack -> opera11
+            return 'opera11'; // use e.stacktrace, format differs from 'opera10a', 'opera10b'
+        } else if (e.stack && !e.fileName) {
+            // Chrome 27 does not have e.arguments as earlier versions,
+            // but still does not have e.fileName as Firefox
+            return 'chrome';
+        } else if (e.stack) {
+            return 'firefox';
+        }
+        return 'other';
+    },
+
+    /**
+     * Given a context, function name, and callback function, overwrite it so that it calls
+     * printStackTrace() first with a callback and then runs the rest of the body.
+     *
+     * @param {Object} context of execution (e.g. window)
+     * @param {String} functionName to instrument
+     * @param {Function} callback function to call with a stack trace on invocation
+     */
+    instrumentFunction: function(context, functionName, callback) {
+        context = context || window;
+        var original = context[functionName];
+        context[functionName] = function instrumented() {
+            callback.call(this, printStackTrace().slice(4));
+            return context[functionName]._instrumented.apply(this, arguments);
+        };
+        context[functionName]._instrumented = original;
+    },
+
+    /**
+     * Given a context and function name of a function that has been
+     * instrumented, revert the function to it's original (non-instrumented)
+     * state.
+     *
+     * @param {Object} context of execution (e.g. window)
+     * @param {String} functionName to de-instrument
+     */
+    deinstrumentFunction: function(context, functionName) {
+        if (context[functionName].constructor === Function &&
+                context[functionName]._instrumented &&
+                context[functionName]._instrumented.constructor === Function) {
+            context[functionName] = context[functionName]._instrumented;
+        }
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on Chrome's stack string.
+     *
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    chrome: function(e) {
+        var stack = (e.stack + '\n').replace(/^\S[^\(]+?[\n$]/gm, '').
+          replace(/^\s+(at eval )?at\s+/gm, '').
+          replace(/^([^\(]+?)([\n$])/gm, '{anonymous}()@$1$2').
+          replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm, '{anonymous}()@$1').split('\n');
+        stack.pop();
+        return stack;
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on Safari's stack string.
+     *
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    safari: function(e) {
+        return e.stack.replace(/\[native code\]\n/m, '')
+            .replace(/^(?=\w+Error\:).*$\n/m, '')
+            .replace(/^@/gm, '{anonymous}()@')
+            .split('\n');
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on IE's stack string.
+     *
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    ie: function(e) {
+        var lineRE = /^.*at (\w+) \(([^\)]+)\)$/gm;
+        return e.stack.replace(/at Anonymous function /gm, '{anonymous}()@')
+            .replace(/^(?=\w+Error\:).*$\n/m, '')
+            .replace(lineRE, '$1@$2')
+            .split('\n');
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on Firefox's stack string.
+     *
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    firefox: function(e) {
+        return e.stack.replace(/(?:\n@:0)?\s+$/m, '').replace(/^[\(@]/gm, '{anonymous}()@').split('\n');
+    },
+
+    opera11: function(e) {
+        var ANON = '{anonymous}', lineRE = /^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;
+        var lines = e.stacktrace.split('\n'), result = [];
+
+        for (var i = 0, len = lines.length; i < len; i += 2) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                var location = match[4] + ':' + match[1] + ':' + match[2];
+                var fnName = match[3] || "global code";
+                fnName = fnName.replace(/<anonymous function: (\S+)>/, "$1").replace(/<anonymous function>/, ANON);
+                result.push(fnName + '@' + location + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+            }
+        }
+
+        return result;
+    },
+
+    opera10b: function(e) {
+        // "<anonymous function: run>([arguments not available])@file://localhost/G:/js/stacktrace.js:27\n" +
+        // "printStackTrace([arguments not available])@file://localhost/G:/js/stacktrace.js:18\n" +
+        // "@file://localhost/G:/js/test/functional/testcase1.html:15"
+        var lineRE = /^(.*)@(.+):(\d+)$/;
+        var lines = e.stacktrace.split('\n'), result = [];
+
+        for (var i = 0, len = lines.length; i < len; i++) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                var fnName = match[1]? (match[1] + '()') : "global code";
+                result.push(fnName + '@' + match[2] + ':' + match[3]);
+            }
+        }
+
+        return result;
+    },
+
+    /**
+     * Given an Error object, return a formatted Array based on Opera 10's stacktrace string.
+     *
+     * @param e - Error object to inspect
+     * @return Array<String> of function calls, files and line numbers
+     */
+    opera10a: function(e) {
+        // "  Line 27 of linked script file://localhost/G:/js/stacktrace.js\n"
+        // "  Line 11 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html: In function foo\n"
+        var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
+        var lines = e.stacktrace.split('\n'), result = [];
+
+        for (var i = 0, len = lines.length; i < len; i += 2) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                var fnName = match[3] || ANON;
+                result.push(fnName + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+            }
+        }
+
+        return result;
+    },
+
+    // Opera 7.x-9.2x only!
+    opera9: function(e) {
+        // "  Line 43 of linked script file://localhost/G:/js/stacktrace.js\n"
+        // "  Line 7 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html\n"
+        var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)/i;
+        var lines = e.message.split('\n'), result = [];
+
+        for (var i = 2, len = lines.length; i < len; i += 2) {
+            var match = lineRE.exec(lines[i]);
+            if (match) {
+                result.push(ANON + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+            }
+        }
+
+        return result;
+    },
+
+    // Safari 5-, IE 9-, and others
+    other: function(curr) {
+        var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i, stack = [], fn, args, maxStackSize = 10;
+        while (curr && curr['arguments'] && stack.length < maxStackSize) {
+            fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
+            args = Array.prototype.slice.call(curr['arguments'] || []);
+            stack[stack.length] = fn + '(' + this.stringifyArguments(args) + ')';
+            curr = curr.caller;
+        }
+        return stack;
+    },
+
+    /**
+     * Given arguments array as a String, substituting type names for non-string types.
+     *
+     * @param {Arguments,Array} args
+     * @return {String} stringified arguments
+     */
+    stringifyArguments: function(args) {
+        var result = [];
+        var slice = Array.prototype.slice;
+        for (var i = 0; i < args.length; ++i) {
+            var arg = args[i];
+            if (arg === undefined) {
+                result[i] = 'undefined';
+            } else if (arg === null) {
+                result[i] = 'null';
+            } else if (arg.constructor) {
+                if (arg.constructor === Array) {
+                    if (arg.length < 3) {
+                        result[i] = '[' + this.stringifyArguments(arg) + ']';
+                    } else {
+                        result[i] = '[' + this.stringifyArguments(slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(slice.call(arg, -1)) + ']';
+                    }
+                } else if (arg.constructor === Object) {
+                    result[i] = '#object';
+                } else if (arg.constructor === Function) {
+                    result[i] = '#function';
+                } else if (arg.constructor === String) {
+                    result[i] = '"' + arg + '"';
+                } else if (arg.constructor === Number) {
+                    result[i] = arg;
+                }
+            }
+        }
+        return result.join(',');
+    },
+
+    sourceCache: {},
+
+    /**
+     * @return the text from a given URL
+     */
+    ajax: function(url) {
+        var req = this.createXMLHTTPObject();
+        if (req) {
+            try {
+                req.open('GET', url, false);
+                //req.overrideMimeType('text/plain');
+                //req.overrideMimeType('text/javascript');
+                req.send(null);
+                //return req.status == 200 ? req.responseText : '';
+                return req.responseText;
+            } catch (e) {
+            }
+        }
+        return '';
+    },
+
+    /**
+     * Try XHR methods in order and store XHR factory.
+     *
+     * @return <Function> XHR function or equivalent
+     */
+    createXMLHTTPObject: function() {
+        var xmlhttp, XMLHttpFactories = [
+            function() {
+                return new XMLHttpRequest();
+            }, function() {
+                return new ActiveXObject('Msxml2.XMLHTTP');
+            }, function() {
+                return new ActiveXObject('Msxml3.XMLHTTP');
+            }, function() {
+                return new ActiveXObject('Microsoft.XMLHTTP');
+            }
+        ];
+        for (var i = 0; i < XMLHttpFactories.length; i++) {
+            try {
+                xmlhttp = XMLHttpFactories[i]();
+                // Use memoization to cache the factory
+                this.createXMLHTTPObject = XMLHttpFactories[i];
+                return xmlhttp;
+            } catch (e) {
+            }
+        }
+    },
+
+    /**
+     * Given a URL, check if it is in the same domain (so we can get the source
+     * via Ajax).
+     *
+     * @param url <String> source url
+     * @return <Boolean> False if we need a cross-domain request
+     */
+    isSameDomain: function(url) {
+        return typeof location !== "undefined" && url.indexOf(location.hostname) !== -1; // location may not be defined, e.g. when running from nodejs.
+    },
+
+    /**
+     * Get source code from given URL if in the same domain.
+     *
+     * @param url <String> JS source URL
+     * @return <Array> Array of source code lines
+     */
+    getSource: function(url) {
+        // TODO reuse source from script tags?
+        if (!(url in this.sourceCache)) {
+            this.sourceCache[url] = this.ajax(url).split('\n');
+        }
+        return this.sourceCache[url];
+    },
+
+    guessAnonymousFunctions: function(stack) {
+        for (var i = 0; i < stack.length; ++i) {
+            var reStack = /\{anonymous\}\(.*\)@(.*)/,
+                reRef = /^(.*?)(?::(\d+))(?::(\d+))?(?: -- .+)?$/,
+                frame = stack[i], ref = reStack.exec(frame);
+
+            if (ref) {
+                var m = reRef.exec(ref[1]);
+                if (m) { // If falsey, we did not get any file/line information
+                    var file = m[1], lineno = m[2], charno = m[3] || 0;
+                    if (file && this.isSameDomain(file) && lineno) {
+                        var functionName = this.guessAnonymousFunction(file, lineno, charno);
+                        stack[i] = frame.replace('{anonymous}', functionName);
+                    }
+                }
+            }
+        }
+        return stack;
+    },
+
+    guessAnonymousFunction: function(url, lineNo, charNo) {
+        var ret;
+        try {
+            ret = this.findFunctionName(this.getSource(url), lineNo);
+        } catch (e) {
+            ret = 'getSource failed with url: ' + url + ', exception: ' + e.toString();
+        }
+        return ret;
+    },
+
+    findFunctionName: function(source, lineNo) {
+        // FIXME findFunctionName fails for compressed source
+        // (more than one function on the same line)
+        // function {name}({args}) m[1]=name m[2]=args
+        var reFunctionDeclaration = /function\s+([^(]*?)\s*\(([^)]*)\)/;
+        // {name} = function ({args}) TODO args capture
+        // /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function(?:[^(]*)/
+        var reFunctionExpression = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*function\b/;
+        // {name} = eval()
+        var reFunctionEvaluation = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
+        // Walk backwards in the source lines until we find
+        // the line which matches one of the patterns above
+        var code = "", line, maxLines = Math.min(lineNo, 20), m, commentPos;
+        for (var i = 0; i < maxLines; ++i) {
+            // lineNo is 1-based, source[] is 0-based
+            line = source[lineNo - i - 1];
+            commentPos = line.indexOf('//');
+            if (commentPos >= 0) {
+                line = line.substr(0, commentPos);
+            }
+            // TODO check other types of comments? Commented code may lead to false positive
+            if (line) {
+                code = line + code;
+                m = reFunctionExpression.exec(code);
+                if (m && m[1]) {
+                    return m[1];
+                }
+                m = reFunctionDeclaration.exec(code);
+                if (m && m[1]) {
+                    //return m[1] + "(" + (m[2] || "") + ")";
+                    return m[1];
+                }
+                m = reFunctionEvaluation.exec(code);
+                if (m && m[1]) {
+                    return m[1];
+                }
+            }
+        }
+        return '(?)';
+    }
+};// Airbrake JavaScript Notifier
+(function() {
+    "use strict";
+    
+    var NOTICE_XML = '<?xml version="1.0" encoding="UTF-8"?>' +
+        '<notice version="2.0">' +
+            '<api-key>{key}</api-key>' +
+            '<notifier>' +
+                '<name>airbrake_js</name>' +
+                '<version>0.2.0</version>' +
+                '<url>http://airbrake.io</url>' +
+            '</notifier>' +
+            '<error>' +
+                '<class>{exception_class}</class>' +
+                '<message><![CDATA[{exception_message}]]></message>' +
+                '<backtrace>{backtrace_lines}</backtrace>' +
+            '</error>' +
+            '<request>' +
+                '<url>{request_url}</url>' +
+                '<component>{request_component}</component>' +
+                '<action>{request_action}</action>' +
+                '{request}' +
+            '</request>' +
+            '<server-environment>' +
+                '<project-root>{project_root}</project-root>' +
+                '<environment-name>{environment}</environment-name>' +
+            '</server-environment>' +
+            '<current-user>' +
+                '<id>{user_id}</id>' +
+                '<name>{user_name}</name>' +
+                '<email>{user_email}</email>' +
+            '</current-user>' +
+        '</notice>',
+        REQUEST_VARIABLE_GROUP_XML = '<{group_name}>{inner_content}</{group_name}>',
+        REQUEST_VARIABLE_XML = '<var key="{key}">{value}</var>',
+        BACKTRACE_LINE_XML = '<line method="{function}" file="{file}" number="{line}" />',
+        Config,
+        Global,
+        Util,
+        _publicAPI,
+        
+        NOTICE_JSON = {
+            "notifier": {
+                "name": "airbrake_js",
+                "version": "0.2.0",
+                "url": "http://airbrake.io"
+            },
+            "error": [
+             {
+				"type": "{exception_class}",
+                "message": "{exception_message}",
+                "backtrace": []
+				
+            }
+			],
+            "context": {
+				"language": "JavaScript",
+				"environment": "{environment}",
+				
+                "version": "1.1.1",
+				"url": "{request_url}",
+                "rootDirectory": "{project_root}",
+                "action": "{request_action}",
+
+				"userId": "{user_id}",
+				"userName": "{user_name}",
+				"userEmail": "{user_email}",
+            },
+            "environment": {},
+			//"session": "",
+			"params": {},
+        };
+
+    Util = {
+        /*
+         * Merge a number of objects into one.
+         * 
+         * Usage example: 
+         *  var obj1 = {
+         *          a: 'a'
+         *      },
+         *      obj2 = {
+         *          b: 'b'     
+         *      },
+         *      obj3 = {
+         *          c: 'c'     
+         *      },
+         *      mergedObj = Util.merge(obj1, obj2, obj3);  
+         *
+         * mergedObj is: {
+         *     a: 'a',
+         *     b: 'b',
+         *     c: 'c'
+         * }
+         * 
+         */
+        merge: (function() {
+            function processProperty (key, dest, src) {
+                if (src.hasOwnProperty(key)) {
+                    dest[key] = src[key];
+                }
+            }
+
+            return function() {
+                var objects = Array.prototype.slice.call(arguments),
+                    obj,
+                    key,
+                    result = {};
+
+                while (obj = objects.shift()) {
+                    for (key in obj) {
+                        processProperty(key, result, obj);
+                    }
+                }
+
+                return result;
+            };
+        })(),
+        
+        /*
+         * Replace &, <, >, ', " characters with correspondent HTML entities.
+         */
+        escape: function (text) {
+            return text.replace(/&/g, '&#38;').replace(/</g, '&#60;').replace(/>/g, '&#62;')
+                    .replace(/'/g, '&#39;').replace(/"/g, '&#34;');
+        },
+        
+        /*
+         * Remove leading and trailing space characters. 
+         */
+        trim: function (text) {
+            return text.toString().replace(/^\s+/, '').replace(/\s+$/, '');
+        },
+        
+        /*
+         * Fill 'text' pattern with 'data' values.
+         * 
+         * e.g. Utils.substitute('<{tag}></{tag}>', {tag: 'div'}, true) will return '<div></div>'
+         * 
+         * emptyForUndefinedData - a flag, if true, all matched {<name>} without data.<name> value specified will be 
+         * replaced with empty string.
+         */
+        substitute: function (text, data, emptyForUndefinedData) {
+            return text.replace(/{([\w_.-]+)}/g, function(match, key) {
+                return (key in data) ? data[key] : (emptyForUndefinedData ? '' : match);
+            });
+        },
+        
+        /*
+         * Perform pattern rendering for an array of data objects. 
+         * Returns a concatenation of rendered strings of all objects in array. 
+         */
+        substituteArr: function (text, dataArr, emptyForUndefinedData) {
+            var _i = 0, _l = 0, 
+                returnStr = '';
+            
+            for (_i = 0, _l = dataArr.length; _i < _l; _i += 1) {
+                returnStr += this.substitute(text, dataArr[_i], emptyForUndefinedData);
+            }
+            
+            return returnStr;
+        },
+        
+        /*
+         * Add hook for jQuery.fn.on function, to manualy call window.Airbrake.captureException() method
+         * for every exception occurred.
+         * 
+         * Let function 'f' be binded as an event handler:
+         * 
+         * $(window).on 'click', f
+         * 
+         * If an exception is occurred inside f's body, it will be catched here 
+         * and forwarded to captureException method.
+         * 
+         * processjQueryEventHandlerWrapping is called every time window.Airbrake.setTrackJQ method is used,
+         * if it switches previously setted value. 
+         */
+        processjQueryEventHandlerWrapping: function () {
+            if (Config.options.trackJQ === true) {
+                Config.jQuery_fn_on_original = Config.jQuery_fn_on_original || jQuery.fn.on;
+
+                jQuery.fn.on = function () {
+                    var args = Array.prototype.slice.call(arguments),
+                        fnArgIdx = 4;
+
+                    // Search index of function argument
+                    while((--fnArgIdx > -1) && (typeof args[fnArgIdx] !== 'function'));
+
+                    // If the function is not found, then subscribe original event handler function
+                    if (fnArgIdx === -1) {
+                        return Config.jQuery_fn_on_original.apply(this, arguments);
+                    }
+
+                    // If the function is found, then subscribe wrapped event handler function
+                    args[fnArgIdx] = (function (fnOriginHandler) {
+                        return function() {
+                            try {
+                                fnOriginHandler.apply(this, arguments);
+                            } catch (e) {
+                                Global.captureException(e);
+                            }
+                        };
+                    })(args[fnArgIdx]);
+                    
+                    // Call original jQuery.fn.on, with the same list of arguments, but 
+                    // a function replaced with a proxy.
+                    return Config.jQuery_fn_on_original.apply(this, args);
+                };
+            } else {
+                // Recover original jQuery.fn.on if Config.options.trackJQ is set to false
+                (typeof Config.jQuery_fn_on_original === 'function') && (jQuery.fn.on = Config.jQuery_fn_on_original);
+            }
+        },
+
+        isjQueryPresent: function () {
+            // Currently only 1.7.x version supported
+            return (typeof jQuery === 'function') && ('fn' in jQuery) && ('jquery' in jQuery.fn)
+                    && (jQuery.fn.jquery.indexOf('1.7') === 0)
+        },
+        
+        /*
+         * Make first letter in a string capital. e.g. 'guessFunctionName' -> 'GuessFunctionName'
+         * Is used to generate getter and setter method names.
+         */
+        capitalizeFirstLetter: function (str) {
+            return str.charAt(0).toUpperCase() + str.slice(1);  
+        },
+        
+        /*
+         * Generate public API from an array of specifically formated objects, e.g.
+         * 
+         * - this will generate 'setEnvironment' and 'getEnvironment' API methods for configObj.xmlData.environment variable:
+         * {
+         *     variable: 'environment',
+         *     namespace: 'xmlData'
+         * }
+         * 
+         * - this will define 'method' function as 'captureException' API method 
+         * {
+         *     methodName: 'captureException',
+         *     method: (function (...) {...});
+         * }
+         * 
+         */
+        generatePublicAPI: (function () {
+            function _generateSetter (variable, namespace, configObj) {
+                return function (value) {
+                    configObj[namespace][variable] = value;
+                };
+            }
+            
+            function _generateGetter (variable, namespace, configObj) {
+                return function (value) {
+                    return configObj[namespace][variable];
+                };
+            }
+            
+            /*
+             * publicAPI: array of specifically formated objects
+             * configObj: inner configuration object 
+             */
+            return function (publicAPI, configObj) {
+                var _i = 0, _m = null, _capitalized = '',
+                    returnObj = {};
+                
+                for (_i = 0; _i < publicAPI.length; _i += 1) {
+                    _m = publicAPI[_i];
+                    
+                    switch (true) {
+                        case (typeof _m.variable !== 'undefined') && (typeof _m.methodName === 'undefined'):
+                            _capitalized = Util.capitalizeFirstLetter(_m.variable)
+                            returnObj['set' + _capitalized] = _generateSetter(_m.variable, _m.namespace, configObj);
+                            returnObj['get' + _capitalized] = _generateGetter(_m.variable, _m.namespace, configObj);
+                            
+                            break;
+                        case (typeof _m.methodName !== 'undefined') && (typeof _m.method !== 'undefined'):
+                            returnObj[_m.methodName] = _m.method
+                            
+                            break;
+                        
+                        default:                       
+                    }
+                }
+                
+                return returnObj;
+            };
+        } ())
+    };
+
+    /*
+     * The object to store settings. Allocated from the Global (windows scope) so that users can change settings
+     * only through the methods, rather than through a direct change of the object fileds. So that we can to handle
+     * change settings event (in setter method).
+     */
+    Config = {
+        xmlData: {
+            environment: 'environment'
+        },
+
+        options: {
+            trackJQ: false, // jQuery.fn.jquery
+            host: 'api.airbrake.io',
+            errorDefaults: {},
+            guessFunctionName: false,
+            requestType: 'GET', // Can be 'POST' or 'GET'
+            outputFormat: 'XML' // Can be 'XML' or 'JSON'
+        }
+    };
+    
+    /*
+     * The public API definition object. If no 'methodName' and 'method' values specified,
+     * getter and setter for 'variable' will be defined.
+     */
+    _publicAPI = [
+        {
+            variable: 'environment',
+            namespace: 'xmlData'
+        }, {
+            variable: 'key',
+            namespace: 'xmlData'
+        }, {
+            variable: 'host',
+            namespace: 'options'
+        },{
+		    variable: 'projectId',
+            namespace: 'options'
+		},{
+            variable: 'errorDefaults',
+            namespace: 'options'
+        }, {
+            variable: 'guessFunctionName',
+            namespace: 'options'
+        }, {
+            variable: 'outputFormat',
+            namespace: 'options'
+        }, {
+            methodName: 'setCurrentUser',
+            method: (function (value) {
+                for (var key in value) {
+                    if (value.hasOwnProperty(key)) {
+                        Config.xmlData['user_' + key] = value[key];
+                    }
+                }
+            })
+        }, {
+            methodName: 'setTrackJQ',
+            variable: 'trackJQ',
+            namespace: 'options',
+            method: (function (value) {
+                if (!Util.isjQueryPresent()) {
+                    throw Error('Please do not call \'Airbrake.setTrackJQ\' if jQuery does\'t present');
+                }
+    
+                value = !!value;
+    
+                if (Config.options.trackJQ === value) {
+                    return;
+                }
+    
+                Config.options.trackJQ = value;
+    
+                Util.processjQueryEventHandlerWrapping();
+            })
+        }, {
+            methodName: 'captureException',
+            method: (function (e) {
+                new Notifier().notify({
+                    message: e.message,
+                    stack: e.stack
+                });
+            })
+        }
+    ];
+
+    // Share to global scope as Airbrake ("window.Hoptoad" for backward compatibility)
+    Global = window.Airbrake = window.Hoptoad = Util.generatePublicAPI(_publicAPI, Config);
+
+    function Notifier() {
+        this.options = Util.merge({}, Config.options);
+        this.xmlData = Util.merge(this.DEF_XML_DATA, Config.xmlData);
+    }
+    
+    Notifier.prototype = {
+        constructor: Notifier,
+        VERSION: '0.2.0',
+        ROOT: window.location.protocol + '//' + window.location.host,
+        BACKTRACE_MATCHER: /^(.*)\@(.*)\:(\d+)$/,
+        backtrace_filters: [/notifier\.js/],
+        DEF_XML_DATA: {
+            request: {}
+        },
+
+        notify: (function () {
+            /*
+             * Emit GET request via <iframe> element.
+             * Data is transmited as a part of query string.
+             */
+            function _sendGETRequest (url, data) {
+                var request = document.createElement('iframe');
+                
+                request.style.display = 'none';
+                request.src = url + '?data=' + data;
+                
+                // When request has been sent, delete iframe
+                request.onload = function () {
+                    // To avoid infinite progress indicator
+                    setTimeout(function() {
+                        document.body.removeChild(request);
+                    }, 0);
+                };
+    
+                document.body.appendChild(request);
+            }
+            
+            /*
+             * Cross-domain AJAX POST request. 
+             * 
+             * It requires a server setup as described in Cross-Origin Resource Sharing spec:
+             * http://www.w3.org/TR/cors/
+             */
+            function _sendPOSTRequest (url, data) {
+                var request = new XMLHttpRequest();
+                request.open('POST', url, true);
+                request.setRequestHeader('Content-Type', 'application/json');
+                request.send(data);
+            }
+            
+            return function (error) {
+                var outputData = '',
+					url =  '';
+				    //
+                
+                   /*
+                    * Should be changed to url = '//' + ...
+                    * to use the protocol of current page (http or https). Only sends 'secure' if page is secure.  
+					* XML uses V2 API. http://collect.airbrake.io/notifier_api/v2/notices
+			       */
+               
+			
+                switch (this.options['outputFormat']) {
+                    case 'XML':
+	                   outputData = encodeURIComponent(this.generateXML(this.generateDataJSON(error)));
+					   url = ('https:' == document.location.protocol ? 'https://' : 'http://') + this.options.host + '/notifier_api/v2/notices';
+                        _sendGETRequest(url, outputData);
+					   break;
+
+                    case 'JSON': 
+ 					/*
+					*   JSON uses API V3. Needs project in URL. 
+					*   http://collect.airbrake.io/api/v3/projects/[PROJECT_ID]/notices?key=[API_KEY]
+					* url = window.location.protocol + '://' + this.options.host + '/api/v3/projects' + this.options.projectId + '/notices?key=' + this.options.key;
+					*/
+ 						outputData = JSON.stringify(this.generateJSON(this.generateDataJSON(error)));  
+						url = ('https:' == document.location.protocol ? 'https://' : 'http://') + this.options.host + '/api/v3/projects/' + this.options.projectId + '/notices?key=' + this.xmlData.key;
+                        _sendPOSTRequest(url, outputData);
+						break;
+
+                    default:
+                }
+
+            };
+        } ()),
+        
+        /*
+         * Generate inner JSON representation of exception data that can be rendered as XML or JSON. 
+         */
+        generateDataJSON: (function () {
+            /*
+             * Generate variables array for inputObj object.
+             * 
+             * e.g.
+             * 
+             * _generateVariables({a: 'a'}) -> [{key: 'a', value: 'a'}]
+             * 
+             */
+            function _generateVariables (inputObj) {
+                var key = '', returnArr = [];
+                
+                for (key in inputObj) {
+                    if (inputObj.hasOwnProperty(key)) {
+                        returnArr.push({
+                            key: key,
+                            value: inputObj[key]
+                        });
+                    }
+                }
+                
+                return returnArr;
+            }
+            
+            /*
+             * Generate Request part of notification.  
+             */
+            function _composeRequestObj (methods, errorObj) {
+                var _i = 0,
+                    returnObj = {},
+                    type = '';
+                
+                for (_i = 0; _i < methods.length; _i += 1) {
+                    type = methods[_i];
+                    if (typeof errorObj[type] !== 'undefined') {
+                        returnObj[type] = _generateVariables(errorObj[type]);
+                    }
+                }
+                
+                return returnObj;             
+            }
+            
+            return function (errorWithoutDefaults) {
+                    /*
+                     * A constructor line:
+                     * 
+                     * this.xmlData = Util.merge(this.DEF_XML_DATA, Config.xmlData);
+                     */
+                var outputData = this.xmlData, 
+                    error = Util.merge(this.options.errorDefaults, errorWithoutDefaults),
+                    
+                    component = error.component || '',
+                    request_url = (error.url || '' + location.href),
+                    
+                    methods = ['cgi-data', 'params', 'session'],
+                    _outputData = null;
+                
+                _outputData = {
+                    request_url: request_url,
+                    request_action: (error.action || ''),
+                    request_component: component,
+                    request: (function () {
+                        if (request_url || component) {
+                            error['cgi-data'] = error['cgi-data'] || {};
+                            error['cgi-data'].HTTP_USER_AGENT = navigator.userAgent;
+                            return Util.merge(outputData.request, _composeRequestObj(methods, error));
+                        } else {
+                            return {}
+                        }
+                    } ()),
+                    
+                    project_root: this.ROOT,
+                    exception_class: (error.type || 'Error'),
+                    exception_message: (error.message || 'Unknown error.'),
+                    backtrace_lines: this.generateBacktrace(error)
+                }
+                
+                outputData = Util.merge(outputData, _outputData);
+                
+                return outputData;
+            };
+        } ()),
+        
+        /*
+         * Generate XML notification from inner JSON representation.
+         * NOTICE_XML is used as pattern.
+         */
+        generateXML: (function () {
+            function _generateRequestVariableGroups (requestObj) {
+                var _group = '',
+                    returnStr = '';
+                
+                for (_group in requestObj) {
+                    if (requestObj.hasOwnProperty(_group)) {
+                        returnStr += Util.substitute(REQUEST_VARIABLE_GROUP_XML, {
+                            group_name: _group,
+                            inner_content: Util.substituteArr(REQUEST_VARIABLE_XML, requestObj[_group], true)
+                        }, true);
+                    }
+                }
+                
+                return returnStr;
+            }
+            
+            return function (JSONdataObj) {
+                JSONdataObj.request = _generateRequestVariableGroups(JSONdataObj.request);
+                JSONdataObj.backtrace_lines = Util.substituteArr(BACKTRACE_LINE_XML, JSONdataObj.backtrace_lines, true);
+                
+                return Util.substitute(NOTICE_XML, JSONdataObj, true);
+            };
+        } ()),
+        
+        /*
+         * Generate JSON notification from inner JSON representation.
+         * NOTICE_JSON is used as pattern.
+         */
+        generateJSON: function (JSONdataObj) {
+            // Pattern string is JSON.stringify(NOTICE_JSON)
+            // The rendered string is parsed back as JSON.
+            var outputJSON = JSON.parse(Util.substitute(JSON.stringify(NOTICE_JSON), JSONdataObj, true));
+            
+            // REMOVED - Request from JSON. 
+			outputJSON.request = Util.merge(outputJSON.request, JSONdataObj.request);
+            outputJSON.error.backtrace = JSONdataObj.backtrace_lines;
+            
+            return outputJSON;
+        },
+        
+        generateBacktrace: function (error) {
+            var backtrace = [],
+                file,
+                i,
+                matches,
+                stacktrace;
+
+            error = error || {};
+
+            if (typeof error.stack !== 'string') {
+                try {
+                    (0)();
+                } catch (e) {
+                    error.stack = e.stack;
+                }
+            }
+
+            stacktrace = this.getStackTrace(error);
+
+            for (i = 0; i < stacktrace.length; i++) {
+                matches = stacktrace[i].match(this.BACKTRACE_MATCHER);
+
+                if (matches && this.validBacktraceLine(stacktrace[i])) {
+                    file = matches[2].replace(this.ROOT, '[PROJECT_ROOT]');
+
+                    if (i === 0 && matches[2].match(document.location.href)) {
+                        // backtrace.push('<line method="" file="internal: " number=""/>');
+                       
+                        backtrace.push({
+						// Updated to fit in with V3 new terms for Backtrace data.
+                            'function': '',
+                            file: 'internal: ',
+                            line: ''
+                        });
+                    }
+
+                    // backtrace.push('<line method="' + Util.escape(matches[1]) + '" file="' + Util.escape(file) +
+                    //        '" number="' + matches[3] + '" />');
+                    
+                    backtrace.push({
+                        'function': Util.escape(matches[1]),
+                        file: Util.escape(file),
+                        line: matches[3]
+                    });
+                }
+            }
+
+            return backtrace;
+        },
+
+        getStackTrace: function (error) {
+            var i,
+                stacktrace = printStackTrace({
+                    e: error,
+                    guess: this.options.guessFunctionName
+                });
+
+            for (i = 0; i < stacktrace.length; i++) {
+                if (stacktrace[i].match(/\:\d+$/)) {
+                    continue;
+                }
+
+                if (stacktrace[i].indexOf('@') === -1) {
+                    stacktrace[i] += '@unsupported.js';
+                }
+
+                stacktrace[i] += ':0';
+            }
+
+            return stacktrace;
+        },
+
+        validBacktraceLine: function (line) {
+            for (var i = 0; i < this.backtrace_filters.length; i++) {
+                if (line.match(this.backtrace_filters[i])) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    };
+
+    window.onerror = function (message, file, line) {
+        setTimeout(function () {
+            new Notifier().notify({
+                message: message,
+                stack: '()@' + file + ':' + line
+            });
+        }, 0);
+
+        return true;
+    };
+})();
+})(window, document);
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'test_queue'
+require 'bundler'
+Bundler.setup(:default, :development, :test)
+require 'test_queue/runner/rspec'
+
+
+class MongoidRspecRunner < TestQueue::Runner::RSpec
+  def after_fork(num)
+    super
+    Mongoid.master = Mongoid.master.connection.db(Mongoid.master.name + "_#{num}")
+  end
+end
+
+MongoidRspecRunner.new.execute
@@ -11,7 +11,7 @@ feature &#39;Sign in with GitHub&#39; do
     visit '/'
     click_link 'Sign in with GitHub'
-    page.should have_content 'Successfully authorized from GitHub account'
+    page.should have_content I18n.t("devise.omniauth_callbacks.success", :kind => 'GitHub')
   end
   scenario 'reject unrecognized user if authenticating via GitHub' do
@@ -9,25 +9,25 @@ describe Api::V1::NoticesController do
     describe "GET /api/v1/notices" do
       before do
-        Fabricate(:notice, :created_at => DateTime.new(2012, 8, 01))
-        Fabricate(:notice, :created_at => DateTime.new(2012, 8, 01))
-        Fabricate(:notice, :created_at => DateTime.new(2012, 8, 21))
-        Fabricate(:notice, :created_at => DateTime.new(2012, 8, 30))
+        Fabricate(:notice, :created_at => Time.new(2012, 8, 01))
+        Fabricate(:notice, :created_at => Time.new(2012, 8, 01))
+        Fabricate(:notice, :created_at => Time.new(2012, 8, 21))
+        Fabricate(:notice, :created_at => Time.new(2012, 8, 30))
       end
       it "should return JSON if JSON is requested" do
         get :index, :auth_token => @user.authentication_token, :format => "json"
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error() #JSON::ParserError)
       end
       it "should return XML if XML is requested" do
         get :index, :auth_token => @user.authentication_token, :format => "xml"
-        lambda { XML::Parser.string(response.body).parse }.should_not raise_error
+        Nokogiri::XML(response.body).errors.should be_empty
       end
       it "should return JSON by default" do
         get :index, :auth_token => @user.authentication_token
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error() #JSON::ParserError)
       end
       describe "given a date range" do
@@ -19,17 +19,17 @@ describe Api::V1::ProblemsController do
       it "should return JSON if JSON is requested" do
         get :index, :auth_token => @user.authentication_token, :format => "json"
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error()#JSON::ParserError)
       end
       it "should return XML if XML is requested" do
         get :index, :auth_token => @user.authentication_token, :format => "xml"
-        lambda { XML::Parser.string(response.body).parse }.should_not raise_error
+        Nokogiri::XML(response.body).errors.should be_empty
       end
       it "should return JSON by default" do
         get :index, :auth_token => @user.authentication_token
-        lambda { JSON.load(response.body) }.should_not raise_error(JSON::ParserError)
+        expect { JSON.load(response.body) }.not_to raise_error()#JSON::ParserError)
       end
 require 'spec_helper'
 describe AppsController do
-  render_views
   it_requires_authentication
   it_requires_admin_privileges :for => {:new => :get, :edit => :get, :create => :post, :update => :put, :destroy => :delete}
-
   describe "GET /apps" do
     context 'when logged in as an admin' do
       it 'finds all apps' do
         sign_in Fabricate(:admin)
         3.times { Fabricate(:app) }
-        apps = App.all
         get :index
-        assigns(:apps).should == apps
+        controller.apps.entries.should == App.all.sort.entries
       end
     end
@@ -27,8 +24,8 @@ describe AppsController do
         Fabricate(:user_watcher, :user => user, :app => watched_app1)
         Fabricate(:user_watcher, :user => user, :app => watched_app2)
         get :index
-        assigns(:apps).should include(watched_app1, watched_app2)
-        assigns(:apps).should_not include(unwatched_app)
+        controller.apps.should include(watched_app1, watched_app2)
+        controller.apps.should_not include(unwatched_app)
       end
     end
   end
@@ -44,7 +41,7 @@ describe AppsController do
       it 'finds the app' do
         get :show, :id => @app.id
-        assigns(:app).should == @app
+        controller.app.should == @app
       end
       it "should not raise errors for app with err without notices" do
@@ -55,7 +52,6 @@ describe AppsController do
       it "should list atom feed successfully" do
         get :show, :id => @app.id, :format => "atom"
         response.should be_success
-        response.body.should match(@problem.message)
       end
       context "pagination" do
@@ -65,13 +61,13 @@ describe AppsController do
         it "should have default per_page value for user" do
           get :show, :id => @app.id
-          assigns(:problems).to_a.size.should == User::PER_PAGE
+          controller.problems.to_a.size.should == User::PER_PAGE
         end
         it "should be able to override default per_page value" do
           @user.update_attribute :per_page, 10
           get :show, :id => @app.id
-          assigns(:problems).to_a.size.should == 10
+          controller.problems.to_a.size.should == 10
         end
       end
@@ -85,14 +81,14 @@ describe AppsController do
         context 'and no params' do
           it 'shows only unresolved problems' do
             get :show, :id => @app.id
-            assigns(:problems).size.should == 1
+            controller.problems.size.should == 1
           end
         end
         context 'and all_problems=true params' do
           it 'shows all errors' do
             get :show, :id => @app.id, :all_errs => true
-            assigns(:problems).size.should == 2
+            controller.problems.size.should == 2
           end
         end
       end
@@ -108,35 +104,35 @@ describe AppsController do
         context 'no params' do
           it 'shows errs for all environments' do
             get :show, :id => @app.id
-            assigns(:problems).size.should == 21
+            controller.problems.size.should == 21
           end
         end
         context 'environment production' do
           it 'shows errs for just production' do
             get :show, :id => @app.id, :environment => 'production'
-            assigns(:problems).size.should == 6
+            controller.problems.size.should == 6
           end
         end
         context 'environment staging' do
           it 'shows errs for just staging' do
             get :show, :id => @app.id, :environment => 'staging'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment development' do
           it 'shows errs for just development' do
             get :show, :id => @app.id, :environment => 'development'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment test' do
           it 'shows errs for just test' do
             get :show, :id => @app.id, :environment => 'test'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
       end
@@ -149,7 +145,7 @@ describe AppsController do
         watcher = Fabricate(:user_watcher, :app => app, :user => user)
         sign_in user
         get :show, :id => app.id
-        assigns(:app).should == app
+        controller.app.should == app
       end
       it 'does not find the app if the user is not watching it' do
@@ -170,19 +166,19 @@ describe AppsController do
     describe "GET /apps/new" do
       it 'instantiates a new app with a prebuilt watcher' do
         get :new
-        assigns(:app).should be_a(App)
-        assigns(:app).should be_new_record
-        assigns(:app).watchers.should_not be_empty
+        controller.app.should be_a(App)
+        controller.app.should be_new_record
+        controller.app.watchers.should_not be_empty
       end
       it "should copy attributes from an existing app" do
         @app = Fabricate(:app, :name => "do not copy",
                              :github_repo => "test/example")
         get :new, :copy_attributes_from => @app.id
-        assigns(:app).should be_a(App)
-        assigns(:app).should be_new_record
-        assigns(:app).name.should be_blank
-        assigns(:app).github_repo.should == "test/example"
+        controller.app.should be_a(App)
+        controller.app.should be_new_record
+        controller.app.name.should be_blank
+        controller.app.github_repo.should == "test/example"
       end
     end
@@ -190,7 +186,7 @@ describe AppsController do
       it 'finds the correct app' do
         app = Fabricate(:app)
         get :edit, :id => app.id
-        assigns(:app).should == app
+        controller.app.should == app
       end
     end
@@ -316,7 +312,6 @@ describe AppsController do
               @app.reload
               @app.issue_tracker_configured?.should == false
-              response.body.should match(/You must specify your/)
             end
           end
         end
@@ -326,12 +321,11 @@ describe AppsController do
     describe "DELETE /apps/:id" do
       before do
         @app = Fabricate(:app)
-        App.stub(:find).with(@app.id).and_return(@app)
       end
       it "should find the app" do
         delete :destroy, :id => @app.id
-        assigns(:app).should == @app
+        controller.app.should == @app
       end
       it "should destroy the app" do
@@ -3,57 +3,63 @@ require &#39;spec_helper&#39;
 describe NoticesController do
   it_requires_authentication :for => { :locate => :get }
+  let(:notice) { Fabricate(:notice) }
+  let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
   let(:app) { Fabricate(:app) }
+  let(:error_report) { double(:valid? => true, :generate_notice! => true, :notice => notice) }
   context 'notices API' do
-    before do
-      @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
-      @app = Fabricate(:app_with_watcher)
-      App.stub(:find_by_api_key!).and_return(@app)
-      @notice = App.report_error!(@xml)
-    end
+    context "with all params" do
+      before do
+        ErrorReport.should_receive(:new).with(xml).and_return(error_report)
+      end
-    it "generates a notice from raw xml [POST]" do
-      App.should_receive(:report_error!).with(@xml).and_return(@notice)
-      request.should_receive(:raw_post).and_return(@xml)
-      post :create, :format => :xml
-      response.should be_success
-      # Same RegExp from Airbrake::Sender#send_to_airbrake (https://github.com/airbrake/airbrake/blob/master/lib/airbrake/sender.rb#L53)
-      # Inspired by https://github.com/airbrake/airbrake/blob/master/test/sender_test.rb
-      response.body.should match(%r{<id[^>]*>#{@notice.id}</id>})
-      response.body.should match(%r{<url[^>]*>(.+)#{locate_path(@notice.id)}</url>})
-    end
+      context "with xml pass in raw_port" do
+        before do
+          request.should_receive(:raw_post).and_return(xml)
+          post :create, :format => :xml
+        end
-    it "generates a notice from xml in a data param [POST]" do
-      App.should_receive(:report_error!).with(@xml).and_return(@notice)
-      post :create, :data => @xml, :format => :xml
-      response.should be_success
-      # Same RegExp from Airbrake::Sender#send_to_airbrake (https://github.com/airbrake/airbrake/blob/master/lib/airbrake/sender.rb#L53)
-      # Inspired by https://github.com/airbrake/airbrake/blob/master/test/sender_test.rb
-      response.body.should match(%r{<id[^>]*>#{@notice.id}</id>})
-      response.body.should match(%r{<url[^>]*>(.+)#{locate_path(@notice.id)}</url>})
-    end
+        it "generates a notice from raw xml [POST]" do
+          response.should be_success
+          # Same RegExp from Airbrake::Sender#send_to_airbrake (https://github.com/airbrake/airbrake/blob/master/lib/airbrake/sender.rb#L53)
+          # Inspired by https://github.com/airbrake/airbrake/blob/master/test/sender_test.rb
+          response.body.should match(%r{<id[^>]*>#{notice.id}</id>})
+          response.body.should match(%r{<url[^>]*>(.+)#{locate_path(notice.id)}</url>})
+        end
+
+      end
-    it "generates a notice from xml [GET]" do
-      App.should_receive(:report_error!).with(@xml).and_return(@notice)
-      get :create, :data => @xml, :format => :xml
-      response.should be_success
-      response.body.should match(%r{<id[^>]*>#{@notice.id}</id>})
-      response.body.should match(%r{<url[^>]*>(.+)#{locate_path(@notice.id)}</url>})
+      it "generates a notice from xml in a data param [POST]" do
+        post :create, :data => xml, :format => :xml
+        response.should be_success
+        # Same RegExp from Airbrake::Sender#send_to_airbrake (https://github.com/airbrake/airbrake/blob/master/lib/airbrake/sender.rb#L53)
+        # Inspired by https://github.com/airbrake/airbrake/blob/master/test/sender_test.rb
+        response.body.should match(%r{<id[^>]*>#{notice.id}</id>})
+        response.body.should match(%r{<url[^>]*>(.+)#{locate_path(notice.id)}</url>})
+      end
+
+      it "generates a notice from xml [GET]" do
+        get :create, :data => xml, :format => :xml
+        response.should be_success
+        response.body.should match(%r{<id[^>]*>#{notice.id}</id>})
+        response.body.should match(%r{<url[^>]*>(.+)#{locate_path(notice.id)}</url>})
+      end
+      context "with an invalid API_KEY" do
+        let(:error_report) { double(:valid? => false) }
+        it 'return 422' do
+          post :create, :format => :xml, :data => xml
+          expect(response.status).to eq 422
+        end
+      end
     end
-    it "sends a notification email" do
-      App.should_receive(:report_error!).with(@xml).and_return(@notice)
-      request.should_receive(:raw_post).and_return(@xml)
-      post :create, :format => :xml
-      response.should be_success
-      response.body.should match(%r{<id[^>]*>#{@notice.id}</id>})
-      response.body.should match(%r{<url[^>]*>(.+)#{locate_path(@notice.id)}</url>})
-      email = ActionMailer::Base.deliveries.last
-      email.to.should include(@app.watchers.first.email)
-      email.subject.should include(@notice.message)
-      email.subject.should include("[#{@app.name}]")
-      email.subject.should include("[#{@notice.environment_name}]")
+    context "without params needed" do
+      it 'return 400' do
+        post :create, :format => :xml
+        expect(response.status).to eq 400
+        expect(response.body).to eq 'Need a data params in GET or raw post data'
+      end
     end
   end
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
 describe ProblemsController do
   it_requires_authentication :for => {
-    :index => :get, :all => :get, :show => :get, :resolve => :put
+    :index => :get, :show => :get, :resolve => :put, :search => :get
   },
   :params => {:app_id => 'dummyid', :id => 'dummyid'}
@@ -12,7 +12,7 @@ describe ProblemsController do
   describe "GET /problems" do
-    render_views
+    #render_views
     context 'when logged in as an admin' do
       before(:each) do
         @user = Fabricate(:admin)
@@ -20,18 +20,6 @@ describe ProblemsController do
         @problem = Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production"))).problem
       end
-      it "should successfully list problems" do
-        get :index
-        response.should be_success
-        response.body.gsub("&#8203;", "").should match(@problem.message)
-      end
-
-      it "should list atom feed successfully" do
-        get :index, :format => "atom"
-        response.should be_success
-        response.body.should match(@problem.message)
-      end
-
       context "pagination" do
         before(:each) do
           35.times { Fabricate :err }
@@ -39,13 +27,13 @@ describe ProblemsController do
         it "should have default per_page value for user" do
           get :index
-          assigns(:problems).to_a.size.should == User::PER_PAGE
+          controller.problems.to_a.size.should == User::PER_PAGE
         end
         it "should be able to override default per_page value" do
           @user.update_attribute :per_page, 10
           get :index
-          assigns(:problems).to_a.size.should == 10
+          controller.problems.to_a.size.should == 10
         end
       end
@@ -60,35 +48,35 @@ describe ProblemsController do
         context 'no params' do
           it 'shows problems for all environments' do
             get :index
-            assigns(:problems).size.should == 21
+            controller.problems.size.should == 21
           end
         end
         context 'environment production' do
           it 'shows problems for just production' do
             get :index, :environment => 'production'
-            assigns(:problems).size.should == 6
+            controller.problems.size.should == 6
           end
         end
         context 'environment staging' do
           it 'shows problems for just staging' do
             get :index, :environment => 'staging'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment development' do
           it 'shows problems for just development' do
             get :index, :environment => 'development'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
         context 'environment test' do
           it 'shows problems for just test' do
             get :index, :environment => 'test'
-            assigns(:problems).size.should == 5
+            controller.problems.size.should == 5
           end
         end
       end
@@ -101,13 +89,13 @@ describe ProblemsController do
         watched_unresolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false))
         watched_resolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true))
         get :index
-        assigns(:problems).should include(watched_unresolved_err.problem)
-        assigns(:problems).should_not include(unwatched_err.problem, watched_resolved_err.problem)
+        controller.problems.should include(watched_unresolved_err.problem)
+        controller.problems.should_not include(unwatched_err.problem, watched_resolved_err.problem)
       end
     end
   end
-  describe "GET /problems/all" do
+  describe "GET /problems - previously all" do
     context 'when logged in as an admin' do
       it "gets a paginated list of all problems" do
         sign_in Fabricate(:admin)
@@ -115,10 +103,10 @@ describe ProblemsController do
         3.times { problems << Fabricate(:err).problem }
         3.times { problems << Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem }
         Problem.should_receive(:ordered_by).and_return(
-          mock('proxy', :page => mock('other_proxy', :per => problems))
+          double('proxy', :page => double('other_proxy', :per => problems))
         )
-        get :all
-        assigns(:problems).should == problems
+        get :index, :all_errs => true
+        controller.problems.should == problems
       end
     end
@@ -128,15 +116,15 @@ describe ProblemsController do
         unwatched_problem = Fabricate(:problem)
         watched_unresolved_problem = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false)
         watched_resolved_problem = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true)
-        get :all
-        assigns(:problems).should include(watched_resolved_problem, watched_unresolved_problem)
-        assigns(:problems).should_not include(unwatched_problem)
+        get :index, :all_errs => true
+        controller.problems.should include(watched_resolved_problem, watched_unresolved_problem)
+        controller.problems.should_not include(unwatched_problem)
       end
     end
   end
   describe "GET /apps/:app_id/problems/:id" do
-    render_views
+    #render_views
     context 'when logged in as an admin' do
       before do
@@ -145,12 +133,12 @@ describe ProblemsController do
       it "finds the app" do
         get :show, :app_id => app.id, :id => err.problem.id
-        assigns(:app).should == app
+        controller.app.should == app
       end
       it "finds the problem" do
         get :show, :app_id => app.id, :id => err.problem.id
-        assigns(:problem).should == err.problem
+        controller.problem.should == err.problem
       end
       it "successfully render page" do
@@ -178,32 +166,6 @@ describe ProblemsController do
         end
       end
-      context "create issue button" do
-        let(:button_matcher) { match(/create issue/) }
-
-        it "should not exist for problem's app without issue tracker" do
-          err = Fabricate :err
-          get :show, :app_id => err.app.id, :id => err.problem.id
-
-          response.body.should_not button_matcher
-        end
-
-        it "should exist for problem's app with issue tracker" do
-          tracker = Fabricate(:lighthouse_tracker)
-          err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app))
-          get :show, :app_id => err.app.id, :id => err.problem.id
-
-          response.body.should button_matcher
-        end
-
-        it "should not exist for problem with issue_link" do
-          tracker = Fabricate(:lighthouse_tracker)
-          err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app, :issue_link => "http://some.host"))
-          get :show, :app_id => err.app.id, :id => err.problem.id
-
-          response.body.should_not button_matcher
-        end
-      end
     end
     context 'when logged in as a user' do
@@ -217,7 +179,7 @@ describe ProblemsController do
       it 'finds the problem if the user is watching the app' do
         get :show, :app_id => @watched_app.to_param, :id => @watched_err.problem.id
-        assigns(:problem).should == @watched_err.problem
+        controller.problem.should == @watched_err.problem
       end
       it 'raises a DocumentNotFound error if the user is not watching the app' do
@@ -233,17 +195,17 @@ describe ProblemsController do
       sign_in Fabricate(:admin)
       @problem = Fabricate(:err)
-      App.stub(:find).with(@problem.app.id).and_return(@problem.app)
+      App.stub(:find).with(@problem.app.id.to_s).and_return(@problem.app)
       @problem.app.problems.stub(:find).and_return(@problem.problem)
       @problem.problem.stub(:resolve!)
     end
     it 'finds the app and the problem' do
-      App.should_receive(:find).with(@problem.app.id).and_return(@problem.app)
+      App.should_receive(:find).with(@problem.app.id.to_s).and_return(@problem.app)
       @problem.app.problems.should_receive(:find).and_return(@problem.problem)
       put :resolve, :app_id => @problem.app.id, :id => @problem.problem.id
-      assigns(:app).should == @problem.app
-      assigns(:problem).should == @problem.problem
+      controller.app.should == @problem.app
+      controller.problem.should == @problem.problem
     end
     it "should resolve the issue" do
@@ -269,7 +231,7 @@ describe ProblemsController do
   end
   describe "POST /apps/:app_id/problems/:id/create_issue" do
-    render_views
+    #render_views
     before(:each) do
       sign_in Fabricate(:admin)
@@ -379,31 +341,25 @@ describe ProblemsController do
       @problem2 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => false)).problem
     end
-    it "should apply to multiple problems" do
-      post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
-      assigns(:selected_problems).should == [@problem1, @problem2]
-    end
-
-    it "should require at least one problem" do
-      post :resolve_several, :problems => []
-      request.flash[:notice].should match(/You have not selected any/)
-    end
-
     context "POST /problems/merge_several" do
       it "should require at least two problems" do
         post :merge_several, :problems => [@problem1.id.to_s]
-        request.flash[:notice].should match(/You must select at least two/)
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.need_two_errors_merge')
       end
       it "should merge the problems" do
-        lambda {
-          post :merge_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
-          assigns(:merged_problem).reload.errs.length.should == 2
-        }.should change(Problem, :count).by(-1)
+        ProblemMerge.should_receive(:new).and_return(double(:merge => true))
+        post :merge_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
       end
     end
     context "POST /problems/unmerge_several" do
+
+      it "should require at least one problem" do
+        post :unmerge_several, :problems => []
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.no_select_problem')
+      end
+
       it "should unmerge a merged problem" do
         merged_problem = Problem.merge!(@problem1, @problem2)
         merged_problem.errs.length.should == 2
@@ -412,9 +368,16 @@ describe ProblemsController do
           merged_problem.reload.errs.length.should == 1
         }.should change(Problem, :count).by(1)
       end
+
     end
     context "POST /problems/resolve_several" do
+
+      it "should require at least one problem" do
+        post :resolve_several, :problems => []
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.no_select_problem')
+      end
+
       it "should resolve the issue" do
         post :resolve_several, :problems => [@problem2.id.to_s]
         @problem2.reload.resolved?.should == true
@@ -428,10 +391,17 @@ describe ProblemsController do
       it "should display a message about 2 errs" do
         post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
         flash[:success].should match(/2 errs have been resolved/)
+        controller.selected_problems.should == [@problem1, @problem2]
       end
     end
     context "POST /problems/unresolve_several" do
+
+      it "should require at least one problem" do
+        post :unresolve_several, :problems => []
+        request.flash[:notice].should eql I18n.t('controllers.problems.flash.no_select_problem')
+      end
+
       it "should unresolve the issue" do
         post :unresolve_several, :problems => [@problem1.id.to_s]
         @problem1.reload.resolved?.should == false
@@ -12,7 +12,7 @@ describe Users::OmniauthCallbacksController do
         :credentials => { :token => token }
       )
     }
-    @controller.stub!(:env).and_return(env)
+    @controller.stub(:env).and_return(env)
   end
   context 'Linking a GitHub account to a signed in user' do
 require 'spec_helper'
 describe UsersController do
-  render_views
   it_requires_authentication
   it_requires_admin_privileges :for => {
@@ -12,42 +11,39 @@ describe UsersController do
     :destroy  => :delete
   }
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+  let(:other_user) { Fabricate(:user) }
+
   context 'Signed in as a regular user' do
+
     before do
-      sign_in @user = Fabricate(:user)
+      sign_in user
     end
     it "should set a time zone" do
-      Time.zone.should.to_s == @user.time_zone
+      Time.zone.should.to_s == user.time_zone
     end
     context "GET /users/:other_id/edit" do
       it "redirects to the home page" do
-        get :edit, :id => Fabricate(:user).id
+        get :edit, :id => other_user.id
         response.should redirect_to(root_path)
       end
     end
     context "GET /users/:my_id/edit" do
       it 'finds the user' do
-        get :edit, :id => @user.id
-        assigns(:user).should == @user
-      end
-
-      it "should have per_page option" do
-        get :edit, :id => @user.id
-        response.body.should match(/id="user_per_page"/)
+        get :edit, :id => user.id
+        controller.user.should == user
+        expect(response).to render_template 'edit'
       end
-      it "should have time_zone option" do
-        get :edit, :id => @user.id
-        response.body.should match(/id="user_time_zone"/)
-      end
     end
     context "PUT /users/:other_id" do
       it "redirects to the home page" do
-        put :update, :id => Fabricate(:user).id
+        put :update, :id => other_user.id
         response.should redirect_to(root_path)
       end
     end
@@ -55,39 +51,47 @@ describe UsersController do
     context "PUT /users/:my_id/id" do
       context "when the update is successful" do
         it "sets a message to display" do
-          put :update, :id => @user.to_param, :user => {:name => 'Kermit'}
+          put :update, :id => user.to_param, :user => {:name => 'Kermit'}
           request.flash[:success].should include('updated')
         end
         it "redirects to the user's page" do
-          put :update, :id => @user.to_param, :user => {:name => 'Kermit'}
-          response.should redirect_to(user_path(@user))
+          put :update, :id => user.to_param, :user => {:name => 'Kermit'}
+          response.should redirect_to(user_path(user))
         end
         it "should not be able to become an admin" do
-          put :update, :id => @user.to_param, :user => {:admin => true}
-          @user.reload.admin.should be_false
+          expect {
+            put :update, :id => user.to_param, :user => {:admin => true}
+          }.to_not change {
+            user.reload.admin
+          }.from(false)
         end
         it "should be able to set per_page option" do
-          put :update, :id => @user.to_param, :user => {:per_page => 555}
-          @user.reload.per_page.should == 555
+          put :update, :id => user.to_param, :user => {:per_page => 555}
+          user.reload.per_page.should == 555
         end
         it "should be able to set time_zone option" do
-          put :update, :id => @user.to_param, :user => {:time_zone => "Warsaw"}
-          @user.reload.time_zone.should == "Warsaw"
+          put :update, :id => user.to_param, :user => {:time_zone => "Warsaw"}
+          user.reload.time_zone.should == "Warsaw"
+        end
+
+        it "should be able to not set github_login option" do
+          put :update, :id => user.to_param, :user => {:github_login => " "}
+          user.reload.github_login.should == nil
         end
         it "should be able to set github_login option" do
-          put :update, :id => @user.to_param, :user => {:github_login => "awesome_name"}
-          @user.reload.github_login.should == "awesome_name"
+          put :update, :id => user.to_param, :user => {:github_login => "awesome_name"}
+          user.reload.github_login.should == "awesome_name"
         end
       end
       context "when the update is unsuccessful" do
         it "renders the edit page" do
-          put :update, :id => @user.to_param, :user => {:name => nil}
+          put :update, :id => user.to_param, :user => {:name => nil}
           response.should render_template(:edit)
         end
       end
@@ -96,81 +100,82 @@ describe UsersController do
   context 'Signed in as an admin' do
     before do
-      @user = Fabricate(:admin)
-      sign_in @user
+      sign_in admin
     end
     context "GET /users" do
+
       it 'paginates all users' do
-        @user.update_attribute :per_page, 2
-        users = 3.times { Fabricate(:user) }
+        admin.update_attribute :per_page, 2
+        users = 3.times {
+          Fabricate(:user)
+        }
         get :index
-        assigns(:users).to_a.size.should == 2
+        controller.users.to_a.size.should == 2
       end
+
     end
     context "GET /users/:id" do
       it 'finds the user' do
-        user = Fabricate(:user)
         get :show, :id => user.id
-        assigns(:user).should == user
+        controller.user.should == user
       end
     end
     context "GET /users/new" do
       it 'assigns a new user' do
         get :new
-        assigns(:user).should be_a(User)
-        assigns(:user).should be_new_record
+        controller.user.should be_a(User)
+        controller.user.should be_new_record
       end
     end
     context "GET /users/:id/edit" do
       it 'finds the user' do
-        user = Fabricate(:user)
         get :edit, :id => user.id
-        assigns(:user).should == user
+        controller.user.should == user
       end
     end
     context "POST /users" do
       context "when the create is successful" do
-        before do
-          @attrs = {:user => Fabricate.attributes_for(:user)}
-        end
+        let(:attrs) { {:user => Fabricate.attributes_for(:user)} }
         it "sets a message to display" do
-          post :create, @attrs
+          post :create, attrs
           request.flash[:success].should include('part of the team')
         end
         it "redirects to the user's page" do
-          post :create, @attrs
-          response.should redirect_to(user_path(assigns(:user)))
+          post :create, attrs
+          response.should redirect_to(user_path(controller.user))
         end
         it "should be able to create admin" do
-          @attrs[:user][:admin] = true
-          post :create, @attrs
+          attrs[:user][:admin] = true
+          post :create, attrs
           response.should be_redirect
-          User.find(assigns(:user).to_param).admin.should be_true
+          User.find(controller.user.to_param).admin.should be_true
         end
         it "should has auth token" do
-          post :create, @attrs
+          post :create, attrs
           User.last.authentication_token.should_not be_blank
         end
       end
       context "when the create is unsuccessful" do
+        let(:user) {
+          Struct.new(:admin, :attributes).new(true, {})
+        }
         before do
-          @user = Fabricate(:user)
-          User.should_receive(:new).and_return(@user)
-          @user.should_receive(:save).and_return(false)
+          User.should_receive(:new).and_return(user)
+          user.should_receive(:save).and_return(false)
         end
         it "renders the new page" do
-          post :create
+          post :create, :user => { :username => 'foo' }
           response.should render_template(:new)
         end
       end
@@ -178,59 +183,85 @@ describe UsersController do
     context "PUT /users/:id" do
       context "when the update is successful" do
-        before do
-          @user = Fabricate(:user)
-        end
-
-        it "sets a message to display" do
-          put :update, :id => @user.to_param, :user => {:name => 'Kermit'}
-          request.flash[:success].should include('updated')
-        end
-
-        it "redirects to the user's page" do
-          put :update, :id => @user.to_param, :user => {:name => 'Kermit'}
-          response.should redirect_to(user_path(@user))
-        end
-
-        it "should be able to make user an admin" do
-          put :update, :id => @user.to_param, :user => {:admin => true}
-          response.should be_redirect
-          User.find(assigns(:user).to_param).admin.should be_true
+        before {
+          put :update, :id => user.to_param, :user => user_params
+        }
+
+        context "with normal params" do
+          let(:user_params) { {:name => 'Kermit'} }
+          it "sets a message to display" do
+            expect(request.flash[:success]).to eq I18n.t('controllers.users.flash.update.success', :name => user.name)
+            expect(response).to redirect_to(user_path(user))
+          end
         end
       end
-
       context "when the update is unsuccessful" do
-        before do
-          @user = Fabricate(:user)
-        end
         it "renders the edit page" do
-          put :update, :id => @user.to_param, :user => {:name => nil}
+          put :update, :id => user.to_param, :user => {:name => nil}
           response.should render_template(:edit)
         end
       end
     end
     context "DELETE /users/:id" do
-      before do
-        @user = Fabricate(:user)
+
+      context "with a destroy success" do
+        let(:user_destroy) { double(:destroy => true) }
+
+        before {
+          UserDestroy.should_receive(:new).with(user).and_return(user_destroy)
+          delete :destroy, :id => user.id
+        }
+
+        it 'should destroy user' do
+          expect(request.flash[:success]).to eq I18n.t('controllers.users.flash.destroy.success', :name => user.name)
+          response.should redirect_to(users_path)
+        end
       end
-      it "destroys the user" do
-        delete :destroy, :id => @user.id
-        User.where(:id => @user.id).first.should be_nil
+      context "with trying destroy himself" do
+        before {
+          UserDestroy.should_not_receive(:new)
+          delete :destroy, :id => admin.id
+        }
+
+        it 'should not destroy user' do
+          response.should redirect_to(users_path)
+          expect(request.flash[:error]).to eq I18n.t('controllers.users.flash.destroy.error')
+        end
       end
+    end
-      it "redirects to the users index page" do
-        delete :destroy, :id => @user.id
-        response.should redirect_to(users_path)
+    describe "#user_params" do
+      context "with current user not admin" do
+        before {
+          controller.stub(:current_user).and_return(user)
+          controller.stub(:params).and_return(ActionController::Parameters.new(user_param))
+        }
+        let(:user_param) { {'user' => { :name => 'foo', :admin => true }} }
+        it 'not have admin field' do
+          expect(controller.send(:user_params)).to eq ({'name' => 'foo'})
+        end
+        context "with password and password_confirmation empty?" do
+          let(:user_param) { {'user' => { :name => 'foo', 'password' => '', 'password_confirmation' => '' }} }
+          it 'not have password and password_confirmation field' do
+            expect(controller.send(:user_params)).to eq ({'name' => 'foo'})
+          end
+        end
       end
-      it "sets a message to display" do
-        delete :destroy, :id => @user.id
-        request.flash[:success].should include('no longer part of your team')
+      context "with current user admin" do
+        it 'have admin field'
+        context "with password and password_confirmation empty?" do
+          it 'not have password and password_confirmation field'
+        end
+        context "on his own user" do
+          it 'not have admin field'
+        end
       end
     end
+
   end
 end
 Fabricator(:app) do
   name { sequence(:app_name){|n| "App ##{n}"} }
+  repository_branch 'master'
 end
 Fabricator(:app_with_watcher, :from => :app) do
-  watchers(:count => 1) { |parent, i| Fabricate.build(:watcher, :app => parent) }
+  watchers(:count => 1) { |parent, i|
+    Fabricate.build(:watcher, :app => parent)
+  }
 end
 Fabricator(:watcher) do
 Fabricator :err do
   problem!
-  error_class!         { 'FooError' }
-  component     'foo'
-  action        'bar'
-  environment   'production'
+  fingerprint 'some-finger-print'
 end
 Fabricator :notice do
@@ -33,3 +33,8 @@ Fabricator :bitbucket_issues_tracker, :from =&gt; :issue_tracker, :class_name =&gt; &quot;I
   project_id 'password'
   api_token 'test_username'
 end
+
+Fabricator :unfuddle_issues_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::UnfuddleTracker" do
+  account 'test'
+  project_id 15
+end
@@ -3,8 +3,15 @@ Fabricator :notification_service  do
   room_id { sequence :word }
   api_token { sequence :word }
   subdomain { sequence :word }
+  notify_at_notices { sequence { |a| [0]} }
 end
-%w(campfire gtalk hipchat hoiio pushover).each do |t|
+Fabricator :gtalk_notification_service, :from => :notification_service, :class_name => "NotificationService::GtalkService" do
+  user_id { sequence :word }
+  service_url { sequence :word }
+  service { sequence :word }
+end
+
+%w(campfire flowdock hipchat hoiio hubot pushover webhook).each do |t|
   Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationService::#{t.camelcase}Service"
 end
 Fabricator(:problem) do
   app! { Fabricate(:app) }
   comments { [] }
+  error_class 'FooError'
+  environment 'production'
 end
 Fabricator(:problem_with_comments, :from => :problem) do
@@ -10,3 +12,13 @@ Fabricator(:problem_with_comments, :from =&gt; :problem) do
     end
   }
 end
+
+Fabricator(:problem_with_errs, :from => :problem) do
+  after_create { |parent|
+    3.times do
+      Fabricate(:err, :problem => parent)
+    end
+  }
+end
+
+
 <?xml version="1.0" encoding="UTF-8"?>
-<notice version="2.3">
+<notice version="2.4">
   <api-key>APIKEY</api-key>
   <notifier>
     <name>Hoptoad Notifier</name>
     <version>2.3.2</version>
     <url>http://hoptoadapp.com</url>
   </notifier>
+  <framework>Rails: 3.2.11</framework>
   <error>
     <class>HoptoadTestingException</class>
-    <message>HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.</message>
+    <message><![CDATA[HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works & works well.]]></message>
     <backtrace>
       <line number="425" file="[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb" method="_run__2115867319__process_action__262109504__callbacks"/>
       <line number="404" file="[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb" method="send"/>
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notice version="2.0">
+  <api-key>APIKEY</api-key>
+  <notifier>
+    <name>Hoptoad Notifier</name>
+    <version>2.3.2</version>
+    <url>http://hoptoadapp.com</url>
+  </notifier>
+  <error>
+    <class>HoptoadTestingException</class>
+    <message>HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.</message>
+    <backtrace></backtrace>
+  </error>
+  <request>
+    <url>http://example.org/verify</url>
+    <component>application</component>
+    <action>verify</action>
+    <params>
+      <var key="action">verify</var>
+      <var key="controller">application</var>
+    </params>
+    <cgi-data>
+      <var key="rack.session"/>
+      <var key="action_dispatch.request.formats">text/html</var>
+      <var key="action_dispatch.request.parameters">
+        <var key="action">verify</var>
+        <var key="controller">application</var>
+      </var>
+      <var key="SERVER_NAME">example.org</var>
+      <var key="rack.url_scheme">http</var>
+      <var key="action_dispatch.remote_ip"/>
+      <var key="CONTENT_LENGTH">0</var>
+      <var key="rack.errors">#&lt;StringIO:0x103d9dec0&gt;</var>
+      <var key="action_dispatch.request.unsigned_session_cookie"/>
+      <var key="action_dispatch.request.query_parameters"/>
+      <var key="HTTPS">off</var>
+      <var key="rack.run_once">false</var>
+      <var key="PATH_INFO">/verify</var>
+      <var key="action_dispatch.secret_token">994f235e3372684bc736dd11842b754d2ddcffc8c2958d33a29527c3217becd6655fa4653a318bc7c34131f9baf2acc0c424ed07e48e0e5e87c6cd34d711e985</var>
+      <var key="rack.version">11</var>
+      <var key="SCRIPT_NAME"/>
+      <var key="action_dispatch.request.path_parameters">
+        <var key="action">verify</var>
+        <var key="controller">application</var>
+      </var>
+      <var key="rack.multithread">false</var>
+      <var key="action_dispatch.parameter_filter">password</var>
+      <var key="action_dispatch.cookies"/>
+      <var key="action_dispatch.request.request_parameters"/>
+      <var key="rack.multiprocess">true</var>
+      <var key="rack.request.query_hash"/>
+      <var key="SERVER_PORT">80</var>
+      <var key="REQUEST_METHOD">GET</var>
+      <var key="action_controller.instance">#&lt;ApplicationController:0x103d2f560&gt;</var>
+      <var key="rack.session.options">
+        <var key="secure">false</var>
+        <var key="httponly">true</var>
+        <var key="path">/</var>
+        <var key="expire_after"/>
+        <var key="domain"/>
+        <var key="id"/>
+      </var>
+      <var key="rack.input">#&lt;StringIO:0x103d9dc90&gt;</var>
+      <var key="action_dispatch.request.content_type"/>
+      <var key="rack.request.query_string"/>
+      <var key="QUERY_STRING"/>
+    </cgi-data>
+  </request>
+  <server-environment>
+    <project-root>/path/to/sample/project</project-root>
+    <environment-name>development</environment-name>
+  </server-environment>
+</notice>
@@ -10,3 +10,12 @@ require &#39;spec_helper&#39;
 #     end
 #   end
 # end
+
+describe ApplicationHelper do
+  let(:notice) { Fabricate(:notice) }
+  describe "#generate_problem_ical" do
+    it 'return the ical format' do
+      helper.generate_problem_ical([notice])
+    end
+  end
+end
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe BacktraceLineHelper do
+  describe "in app lines" do
+    let(:notice) do
+      Fabricate.build(:notice, :backtrace =>
+        Fabricate.build(:backtrace, :lines => [
+          Fabricate.build(:backtrace_line, :file => "[PROJECT_ROOT]/path/to/asset.js")
+        ])
+      )
+    end
+
+    describe '#link_to_source_file' do
+      it 'still returns text for in app file and line number when no repo is configured' do
+        result = link_to_source_file(notice.backtrace.lines.first) { haml_concat "link text" }
+        result.strip.should == 'link text'
+      end
+    end
+  end
+end
@@ -31,5 +31,40 @@ describe ProblemsHelper do
         helper.gravatar_tag(email, :d => 'retro', :s => 48).should eq(expected)
       end
     end
+
+    context "no email" do
+      it "should not render the tag" do
+        helper.gravatar_tag(nil).should be_nil
+      end
+    end
+  end
+
+  describe "#gravatar_url" do
+    context "no email" do
+      let(:email) { nil }
+
+      it "should return nil" do
+        helper.gravatar_url(email).should be_nil
+      end
+    end
+
+    context "without ssl" do
+      let(:email) { "gravatar@example.com" }
+      let(:email_hash) { Digest::MD5.hexdigest email }
+
+      it "should return the http url" do
+        helper.gravatar_url(email).should eq("http://www.gravatar.com/avatar/#{email_hash}?d=identicon")
+      end
+    end
+
+    context "with ssl" do
+      let(:email) { "gravatar@example.com" }
+      let(:email_hash) { Digest::MD5.hexdigest email }
+
+      it "should return the http url" do
+        ActionController::TestRequest.any_instance.stub :ssl? => true
+        helper.gravatar_url(email).should eq("https://secure.gravatar.com/avatar/#{email_hash}?d=identicon")
+      end
+    end
   end
 end
@@ -8,8 +8,8 @@ describe ProblemDestroy do
   context "in unit way" do
     let(:problem) {
       problem = Problem.new
-      problem.stub(:errs).and_return(mock(:criteria, :only => [err_1, err_2]))
-      problem.stub(:comments).and_return(mock(:criteria, :only => [comment_1, comment_2]))
+      problem.stub(:errs).and_return(double(:criteria, :only => [err_1, err_2]))
+      problem.stub(:comments).and_return(double(:criteria, :only => [comment_1, comment_2]))
       problem.stub(:delete)
       problem
     }
@@ -32,17 +32,17 @@ describe ProblemDestroy do
       end
       it 'delete all errs associate' do
-        Err.collection.should_receive(:remove).with(:_id => { '$in' => [err_1.id, err_2.id] })
+        Err.should_receive(:delete_all).with(:_id => { '$in' => [err_1.id, err_2.id] })
         problem_destroy.execute
       end
       it 'delete all comments associate' do
-        Comment.collection.should_receive(:remove).with(:_id => { '$in' => [comment_1.id, comment_2.id] })
+        Comment.should_receive(:delete_all).with(:_id => { '$in' => [comment_1.id, comment_2.id] })
         problem_destroy.execute
       end
       it 'delete all notice of associate to this errs' do
-        Notice.collection.should_receive(:remove).with({:err_id => { '$in' => [err_1.id, err_2.id] }})
+        Notice.should_receive(:delete_all).with({:err_id => { '$in' => [err_1.id, err_2.id] }})
         problem_destroy.execute
       end
     end
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe ProblemMerge do
+  let(:problem) { Fabricate(:problem_with_errs) }
+  let(:problem_1) { Fabricate(:problem_with_errs) }
+
+  describe "#initialize" do
+    it 'failed if less than 2 uniq problem pass in args' do
+      expect {
+        ProblemMerge.new(problem)
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'extract first problem like merged_problem' do
+      problem_merge = ProblemMerge.new(problem, problem, problem_1)
+      expect(problem_merge.merged_problem).to eql problem
+    end
+    it 'extract other problem like child_problems' do
+      problem_merge = ProblemMerge.new(problem, problem, problem_1)
+      expect(problem_merge.child_problems).to eql [problem_1]
+    end
+  end
+
+  describe "#merge" do
+    let!(:problem_merge) {
+      ProblemMerge.new(problem, problem_1)
+    }
+    let(:first_errs) { problem.errs }
+    let(:merged_errs) { problem_1.errs }
+    let!(:notice) { Fabricate(:notice, :err => first_errs.first) }
+    let!(:notice_1) { Fabricate(:notice, :err => merged_errs.first) }
+
+    it 'delete one of problem' do
+      expect {
+        problem_merge.merge
+      }.to change(Problem, :count).by(-1)
+    end
+
+    it 'move all err in one problem' do
+      problem_merge.merge
+      expect(problem.reload.errs.map(&:id).sort).to eq (first_errs | merged_errs).map(&:id).sort
+    end
+
+    it 'update problem cache' do
+      ProblemUpdaterCache.should_receive(:new).with(problem).and_return(double(:update => true))
+      problem_merge.merge
+    end
+
+    context "with problem with comment" do
+      let!(:comment) { Fabricate(:comment, :err => problem ) }
+      let!(:comment_2) { Fabricate(:comment, :err => problem_1, :user => comment.user ) }
+      it 'merge comment' do
+        expect {
+          problem_merge.merge
+        }.to change{
+          problem.comments.size
+        }.from(1).to(2)
+        expect(comment_2.reload.err).to eq problem
+      end
+    end
+  end
+end
@@ -0,0 +1,147 @@
+require 'spec_helper'
+
+describe ProblemUpdaterCache do
+  let(:problem) { Fabricate(:problem_with_errs) }
+  let(:first_errs) { problem.errs }
+  let!(:notice) { Fabricate(:notice, :err => first_errs.first) }
+
+  describe "#update" do
+    context "without notice pass args" do
+      before do
+        problem.update_attribute(:notices_count, 0)
+      end
+
+      it 'update the notice_count' do
+        expect {
+          ProblemUpdaterCache.new(problem).update
+        }.to change{
+          problem.notices_count
+        }.from(0).to(1)
+      end
+
+      context "with only one notice" do
+        before do
+          problem.update_attributes!(:messages => {})
+          ProblemUpdaterCache.new(problem).update
+        end
+
+        it 'update information about this notice' do
+          expect(problem.message).to eq notice.message
+          expect(problem.where).to eq notice.where
+        end
+
+        it 'update first_notice_at' do
+          expect(problem.first_notice_at).to eq notice.reload.created_at
+        end
+
+        it 'update last_notice_at' do
+          expect(problem.last_notice_at).to eq notice.reload.created_at
+        end
+
+        it 'update stats messages' do
+          expect(problem.messages).to eq({
+            Digest::MD5.hexdigest(notice.message) => {'value' => notice.message, 'count' => 1}
+          })
+        end
+
+        it 'update stats hosts' do
+          expect(problem.hosts).to eq({
+            Digest::MD5.hexdigest(notice.host) => {'value' => notice.host, 'count' => 1}
+          })
+        end
+
+        it 'update stats user_agents' do
+          expect(problem.user_agents).to eq({
+            Digest::MD5.hexdigest(notice.user_agent_string) => {'value' => notice.user_agent_string, 'count' => 1}
+          })
+        end
+      end
+
+      context "with several notices" do
+        let!(:notice_2) { Fabricate(:notice, :err => first_errs.first) }
+        let!(:notice_3) { Fabricate(:notice, :err => first_errs.first) }
+        before do
+          problem.update_attributes!(:messages => {})
+          ProblemUpdaterCache.new(problem).update
+        end
+        it 'update information about this notice' do
+          expect(problem.message).to eq notice.message
+          expect(problem.where).to eq notice.where
+        end
+
+        it 'update first_notice_at' do
+          expect(problem.first_notice_at.to_i).to be_within(1).of(notice.created_at.to_i)
+        end
+
+        it 'update last_notice_at' do
+          expect(problem.last_notice_at.to_i).to be_within(1).of(notice.created_at.to_i)
+        end
+
+        it 'update stats messages' do
+          expect(problem.messages).to eq({
+            Digest::MD5.hexdigest(notice.message) => {'value' => notice.message, 'count' => 3}
+          })
+        end
+
+        it 'update stats hosts' do
+          expect(problem.hosts).to eq({
+            Digest::MD5.hexdigest(notice.host) => {'value' => notice.host, 'count' => 3}
+          })
+        end
+
+        it 'update stats user_agents' do
+          expect(problem.user_agents).to eq({
+            Digest::MD5.hexdigest(notice.user_agent_string) => {'value' => notice.user_agent_string, 'count' => 3}
+          })
+        end
+
+      end
+    end
+
+    context "with notice pass in args" do
+
+      before do
+        ProblemUpdaterCache.new(problem, notice).update
+      end
+
+      it 'increase notices_count by 1' do
+        expect {
+          ProblemUpdaterCache.new(problem, notice).update
+        }.to change{
+          problem.notices_count
+        }.by(1)
+      end
+
+      it 'update information about this notice' do
+        expect(problem.message).to eq notice.message
+        expect(problem.where).to eq notice.where
+      end
+
+      it 'update first_notice_at' do
+        expect(problem.first_notice_at).to eq notice.created_at
+      end
+
+      it 'update last_notice_at' do
+        expect(problem.last_notice_at).to eq notice.created_at
+      end
+
+      it 'inc stats messages' do
+        expect(problem.messages).to eq({
+          Digest::MD5.hexdigest(notice.message) => {'value' => notice.message, 'count' => 2}
+        })
+      end
+
+      it 'inc stats hosts' do
+        expect(problem.hosts).to eq({
+          Digest::MD5.hexdigest(notice.host) => {'value' => notice.host, 'count' => 2}
+        })
+      end
+
+      it 'inc stats user_agents' do
+        expect(problem.user_agents).to eq({
+          Digest::MD5.hexdigest(notice.user_agent_string) => {'value' => notice.user_agent_string, 'count' => 2}
+        })
+      end
+    end
+  end
+end
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe ResolvedProblemClearer do
+  let(:resolved_problem_clearer) {
+    ResolvedProblemClearer.new
+  }
+  describe "#execute" do
+    let!(:problems) {
+      [
+        Fabricate(:problem),
+        Fabricate(:problem),
+        Fabricate(:problem)
+      ]
+    }
+    context 'without problem resolved' do
+      it 'do nothing' do
+        expect {
+          expect(resolved_problem_clearer.execute).to eq 0
+        }.to_not change {
+          Problem.count
+        }
+      end
+      it 'not repair database' do
+        Mongoid.default_session.stub(:command).and_call_original
+        Mongoid.default_session.should_not_receive(:command).with({:repairDatabase => 1})
+        resolved_problem_clearer.execute
+      end
+    end
+
+    context "with problem resolve" do
+      before do
+        Mongoid.default_session.stub(:command).and_call_original
+        Mongoid.default_session.stub(:command).with({:repairDatabase => 1})
+        problems.first.resolve!
+        problems.second.resolve!
+      end
+
+      it 'delete problem resolve' do
+        expect {
+          expect(resolved_problem_clearer.execute).to eq 2
+        }.to change {
+          Problem.count
+        }.by(-2)
+        expect(Problem.where(:_id => problems.first.id).first).to be_nil
+        expect(Problem.where(:_id => problems.second.id).first).to be_nil
+      end
+
+      it 'repair database' do
+        Mongoid.default_session.stub(:command).and_call_original
+        Mongoid.default_session.should_receive(:command).with({:repairDatabase => 1})
+        resolved_problem_clearer.execute
+      end
+    end
+  end
+end
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe UserDestroy do
+  let(:app) { Fabricate(
+    :app,
+    :watchers => [
+      Fabricate.build(:user_watcher, :user => user)
+    ])
+  }
+
+  describe "#destroy" do
+    let!(:user) { Fabricate(:user) }
+    it 'should delete user' do
+      expect {
+        UserDestroy.new(user).destroy
+      }.to change(User, :count)
+    end
+
+    it 'should delete watcher' do
+      expect {
+        UserDestroy.new(user).destroy
+      }.to change{
+        app.reload.watchers.where(:user_id => user.id).count
+      }.from(1).to(0)
+    end
+  end
+end
@@ -6,19 +6,76 @@ describe Mailer do
     include EmailSpec::Matchers
     let(:notice)  { Fabricate(:notice, :message => "class < ActionController::Base") }
-    let!(:email)  { Mailer.err_notification(notice).deliver }
+    let!(:user)   { Fabricate(:admin) }
+
+    before do
+      notice.backtrace.lines.last.update_attributes(:file => "[PROJECT_ROOT]/path/to/file.js")
+      notice.app.update_attributes(
+        :asset_host => "http://example.com",
+        :notify_all_users => true
+      )
+      notice.problem.update_attributes :notices_count => 3
+
+      @email = Mailer.err_notification(notice).deliver
+    end
     it "should send the email" do
       ActionMailer::Base.deliveries.size.should == 1
     end
     it "should html-escape the notice's message for the html part" do
-      email.should have_body_text("class &lt; ActionController::Base")
+      @email.should have_body_text("class &lt; ActionController::Base")
     end
     it "should have inline css" do
-      email.should have_body_text('<p class="backtrace" style="')
+      @email.should have_body_text('<p class="backtrace" style="')
+    end
+
+    it "should have links to source files" do
+      @email.should have_body_text('<a href="http://example.com/path/to/file.js" target="_blank">path/to/file.js')
+    end
+
+    it "should have the error count in the subject" do
+      @email.subject.should =~ /^\(3\) /
+    end
+
+    context 'with a very long message' do
+      let(:notice)  { Fabricate(:notice, :message => 6.times.collect{|a| "0123456789" }.join('')) }
+      it "should truncate the long message" do
+        @email.subject.should =~ / \d{47}\.{3}$/
+      end
     end
   end
-end
+  context "Comment Notification" do
+    include EmailSpec::Helpers
+    include EmailSpec::Matchers
+
+    let!(:notice) { Fabricate(:notice) }
+    let!(:comment) { Fabricate.build(:comment, :err => notice.problem) }
+    let!(:watcher) { Fabricate(:watcher, :app => comment.app) }
+    let(:recipients) { ['recipient@example.com', 'another@example.com']}
+
+    before do
+      comment.stub(:notification_recipients).and_return(recipients)
+      Fabricate(:notice, :err => notice.err)
+      @email = Mailer.comment_notification(comment).deliver
+    end
+
+    it "should send the email" do
+      ActionMailer::Base.deliveries.size.should == 1
+    end
+
+    it "should be sent to comment notification recipients" do
+      @email.to.should == recipients
+    end
+
+    it "should have the notices count in the body" do
+      @email.should have_body_text("This err has occurred 2 times")
+    end
+
+    it "should have the comment body" do
+      @email.should have_body_text(comment.body)
+    end
+  end
+end
 require 'spec_helper'
 describe App do
+  context "Attributes" do
+    it { should have_field(:_id).of_type(String) }
+    it { should have_field(:name).of_type(String) }
+    it { should have_fields(:api_key, :github_repo, :bitbucket_repo, :asset_host, :repository_branch) }
+    it { should have_fields(:resolve_errs_on_deploy, :notify_all_users, :notify_on_errs, :notify_on_deploys).of_type(Boolean) }
+    it { should have_field(:email_at_notices).of_type(Array).with_default_value_of(Errbit::Config.email_at_notices) }
+  end
+
   context 'validations' do
     it 'requires a name' do
       app = Fabricate.build(:app, :name => nil)
@@ -96,7 +104,7 @@ describe App do
   context '#github_url_to_file' do
     it 'resolves to full path to file' do
       app = Fabricate(:app, :github_repo => "errbit/errbit")
-      app.github_url_to_file('/path/to/file').should == "https://github.com/errbit/errbit/blob/master/path/to/file"
+      app.github_url_to_file('path/to/file').should == "https://github.com/errbit/errbit/blob/master/path/to/file"
     end
   end
@@ -124,6 +132,25 @@ describe App do
     end
   end
+  context "emailable?" do
+    it "should be true if notify on errs and there are notification recipients" do
+      app = Fabricate(:app, :notify_on_errs => true, :notify_all_users => false)
+      2.times { Fabricate(:watcher, :app => app) }
+      app.emailable?.should be_true
+    end
+
+    it "should be false if notify on errs is disabled" do
+      app = Fabricate(:app, :notify_on_errs => false, :notify_all_users => false)
+      2.times { Fabricate(:watcher, :app => app) }
+      app.emailable?.should be_false
+    end
+
+    it "should be false if there are no notification recipients" do
+      app = Fabricate(:app, :notify_on_errs => true, :notify_all_users => false)
+      app.watchers.should be_empty
+      app.emailable?.should be_false
+    end
+  end
   context "copying attributes from existing app" do
     it "should only copy the necessary fields" do
@@ -137,135 +164,58 @@ describe App do
     end
   end
-
   context '#find_or_create_err!' do
-    before do
-      @app = Fabricate(:app)
-      @conditions = {
+    let(:app) { Fabricate(:app) }
+    let(:conditions) { {
         :error_class  => 'Whoops',
-        :component    => 'Foo',
-        :action       => 'bar',
-        :environment  => 'production'
+        :environment  => 'production',
+        :fingerprint  => 'some-finger-print'
       }
-    end
+    }
     it 'returns the correct err if one already exists' do
-      existing = Fabricate(:err, @conditions.merge(:problem => Fabricate(:problem, :app => @app)))
-      Err.where(@conditions).first.should == existing
-      @app.find_or_create_err!(@conditions).should == existing
+      existing = Fabricate(:err, conditions.merge(:problem => Fabricate(:problem, :app => app)))
+      Err.where(conditions).first.should == existing
+      app.find_or_create_err!(conditions).should == existing
     end
     it 'assigns the returned err to the given app' do
-      @app.find_or_create_err!(@conditions).app.should == @app
+      app.find_or_create_err!(conditions).app.should == app
     end
     it 'creates a new problem if a matching one does not already exist' do
-      Err.where(@conditions).first.should be_nil
+      Err.where(conditions).first.should be_nil
       lambda {
-        @app.find_or_create_err!(@conditions)
+        app.find_or_create_err!(conditions)
       }.should change(Problem,:count).by(1)
     end
-  end
-
-
-  context '#report_error!' do
-    before do
-      @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
-      @app = Fabricate(:app, :api_key => 'APIKEY')
-      ErrorReport.any_instance.stub(:fingerprint).and_return('fingerprintdigest')
-    end
-
-    it 'finds the correct app' do
-      @notice = App.report_error!(@xml)
-      @notice.err.app.should == @app
-    end
-
-    it 'finds the correct err for the notice' do
-      App.should_receive(:find_by_api_key!).and_return(@app)
-      @app.should_receive(:find_or_create_err!).with({
-        :error_class  => 'HoptoadTestingException',
-        :component    => 'application',
-        :action       => 'verify',
-        :environment  => 'development',
-        :fingerprint  => 'fingerprintdigest'
-      }).and_return(err = Fabricate(:err))
-      err.notices.stub(:create!)
-      @notice = App.report_error!(@xml)
-    end
-
-    it 'marks the err as unresolved if it was previously resolved' do
-      App.should_receive(:find_by_api_key!).and_return(@app)
-      @app.should_receive(:find_or_create_err!).with({
-        :error_class  => 'HoptoadTestingException',
-        :component    => 'application',
-        :action       => 'verify',
-        :environment  => 'development',
-        :fingerprint  => 'fingerprintdigest'
-      }).and_return(err = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)))
-      err.should be_resolved
-      @notice = App.report_error!(@xml)
-      @notice.err.should == err
-      @notice.err.should_not be_resolved
-    end
-    it 'should create a new notice' do
-      @notice = App.report_error!(@xml)
-      @notice.should be_persisted
-    end
-
-    it 'assigns an err to the notice' do
-      @notice = App.report_error!(@xml)
-      @notice.err.should be_a(Err)
-    end
-
-    it 'captures the err message' do
-      @notice = App.report_error!(@xml)
-      @notice.message.should == 'HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.'
-    end
-
-    it 'captures the backtrace' do
-      @notice = App.report_error!(@xml)
-      @notice.backtrace_lines.size.should == 73
-      @notice.backtrace_lines.last['file'].should == '[GEM_ROOT]/bin/rake'
-    end
-
-    it 'captures the server_environment' do
-      @notice = App.report_error!(@xml)
-      @notice.server_environment['environment-name'].should == 'development'
-    end
-
-    it 'captures the request' do
-      @notice = App.report_error!(@xml)
-      @notice.request['url'].should == 'http://example.org/verify'
-      @notice.request['params']['controller'].should == 'application'
-    end
-
-    it 'captures the notifier' do
-      @notice = App.report_error!(@xml)
-      @notice.notifier['name'].should == 'Hoptoad Notifier'
-    end
-
-    it "should handle params without 'request' section" do
-      xml = Rails.root.join('spec','fixtures','hoptoad_test_notice_without_request_section.xml').read
-      lambda { App.report_error!(xml) }.should_not raise_error
+    context "without error_class" do
+      let(:conditions) { {
+        :environment  => 'production',
+        :fingerprint  => 'some-finger-print'
+      }
+      }
+      it 'save the err' do
+        Err.where(conditions).first.should be_nil
+        lambda {
+          app.find_or_create_err!(conditions)
+        }.should change(Problem,:count).by(1)
+      end
     end
+  end
-    it "should handle params with only a single line of backtrace" do
-      xml = Rails.root.join('spec','fixtures','hoptoad_test_notice_with_one_line_of_backtrace.xml').read
-      lambda { @notice = App.report_error!(xml) }.should_not raise_error
-      @notice.backtrace_lines.length.should == 1
+  describe ".find_by_api_key!" do
+    it 'return the app with api_key' do
+      app = Fabricate(:app)
+      expect(App.find_by_api_key!(app.api_key)).to eq app
     end
-
-    it 'captures the current_user' do
-      @notice = App.report_error!(@xml)
-      @notice.current_user['id'].should == '123'
-      @notice.current_user['name'].should == 'Mr. Bean'
-      @notice.current_user['email'].should == 'mr.bean@example.com'
-      @notice.current_user['username'].should == 'mrbean'
+    it 'raise Mongoid::Errors::DocumentNotFound if not found' do
+      expect {
+        App.find_by_api_key!('foo')
+      }.to raise_error(Mongoid::Errors::DocumentNotFound)
     end
-
   end
-
 end
@@ -3,12 +3,25 @@ require &#39;spec_helper&#39;
 describe BacktraceLineNormalizer do
   subject { described_class.new(raw_line).call }
-  describe "sanitize file" do
-    let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => ActiveSupport.methods.shuffle.first.to_s } }
+  describe "sanitize" do
+    context "unknown file and method" do
+      let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => nil } }
-    it "should replace nil file with [unknown source]" do
-      subject['file'].should == "[unknown source]"
+      it "should replace nil file with [unknown source]" do
+        subject['file'].should == "[unknown source]"
+      end
+
+      it "should replace nil method with [unknown method]" do
+        subject['method'].should == "[unknown method]"
+      end
     end
+    context "in app file" do
+      let(:raw_line) { { 'number' => rand(999), 'file' => "[PROJECT_ROOT]/assets/file.js?body=1", 'method' => nil } }
+
+      it "should strip query strings from files" do
+        subject['file'].should == "[PROJECT_ROOT]/assets/file.js"
+      end
+    end
   end
 end
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe BacktraceLine do
+  subject { described_class.new(raw_line) }
+
+  describe "root at the start of decorated filename" do
+    let(:raw_line) { { 'number' => rand(999), 'file' => '[PROJECT_ROOT]/app/controllers/pages_controller.rb', 'method' => ActiveSupport.methods.shuffle.first.to_s } }
+    it "should leave leading root symbol in filepath" do
+      subject.decorated_path.should == 'app/controllers/'
+    end
+  end
+end
@@ -22,8 +22,8 @@ describe Backtrace do
   describe "find_or_create" do
     subject { described_class.find_or_create(attributes) }
-    let(:attributes) { mock :attributes }
-    let(:backtrace) { mock :backtrace }
+    let(:attributes) { double :attributes }
+    let(:backtrace) { double :backtrace }
     before { described_class.stub(:new => backtrace) }
@@ -37,7 +37,7 @@ describe Backtrace do
     end
     context "similar backtrace exist" do
-      let(:similar_backtrace) { mock :similar_backtrace }
+      let(:similar_backtrace) { double :similar_backtrace }
       before { backtrace.stub(:similar => similar_backtrace) }
       it { should == similar_backtrace }
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe CommentObserver do
+  context 'when a Comment is saved' do
+    let(:comment) { Fabricate.build(:comment) }
+
+    context 'and it is emailable?' do
+      before { comment.stub(:emailable?).and_return(true) }
+
+      it 'should send an email notification' do
+        Mailer.should_receive(:comment_notification).
+          with(comment).
+          and_return(double('email', :deliver => true))
+        comment.save
+      end
+    end
+
+    context 'and it is not emailable?' do
+      before { comment.stub(:emailable?).and_return(false) }
+
+      it 'should not send an email notification' do
+        Mailer.should_not_receive(:comment_notification)
+        comment.save
+      end
+    end
+  end
+end
@@ -8,5 +8,48 @@ describe Comment do
       comment.errors[:body].should include("can't be blank")
     end
   end
-end
+  context 'notification_recipients' do
+    let(:app) { Fabricate(:app) }
+    let!(:watcher) { Fabricate(:watcher, :app => app) }
+    let(:err) { Fabricate(:problem, :app => app) }
+    let(:comment_user) { Fabricate(:user, :email => 'author@example.com') }
+    let(:comment) { Fabricate.build(:comment, :err => err, :user => comment_user) }
+
+    before do
+      Fabricate(:user_watcher, :app => app, :user => comment_user)
+    end
+
+    it 'includes app notification_recipients except user email' do
+      comment.notification_recipients.should == [watcher.address]
+    end
+  end
+
+  context 'emailable?' do
+    let(:app) { Fabricate(:app, :notify_on_errs => true) }
+    let!(:watcher) { Fabricate(:watcher, :app => app) }
+    let(:err) { Fabricate(:problem, :app => app) }
+    let(:comment_user) { Fabricate(:user, :email => 'author@example.com') }
+    let(:comment) { Fabricate.build(:comment, :err => err, :user => comment_user) }
+
+    before do
+      Fabricate(:user_watcher, :app => app, :user => comment_user)
+    end
+
+    it 'should be true if app is emailable? and there are notification recipients' do
+      comment.emailable?.should be_true
+    end
+
+    it 'should be false if app is not emailable?' do
+      app.update_attribute(:notify_on_errs, false)
+      comment.notification_recipients.should be_any
+      comment.emailable?.should be_false
+    end
+
+    it 'should be false if there are no notification recipients' do
+      watcher.destroy
+      app.emailable?.should be_true
+      comment.emailable?.should be_false
+    end
+  end
+end
@@ -5,7 +5,7 @@ describe DeployObserver do
     context 'and the app should notify on deploys' do
       it 'should send an email notification' do
         Mailer.should_receive(:deploy_notification).
-          and_return(mock('email', :deliver => true))
+          and_return(double('email', :deliver => true))
         Fabricate(:deploy, :app => Fabricate(:app_with_watcher, :notify_on_deploys => true))
       end
     end
 require 'spec_helper'
 describe Err do
-  it 'sets a default error_class and environment' do
-    err = Err.new
-    err.error_class.should == "UnknownError"
-    err.environment.should == "unknown"
+
+  context 'validations' do
+    it 'requires a fingerprint' do
+      err = Fabricate.build(:err, :fingerprint => nil)
+      err.should_not be_valid
+      err.errors[:fingerprint].should include("can't be blank")
+    end
+
+    it 'requires a problem' do
+      err = Fabricate.build(:err, :problem_id => nil)
+      err.should_not be_valid
+      err.errors[:problem_id].should include("can't be blank")
+    end
   end
-end
+end
@@ -0,0 +1,233 @@
+require 'spec_helper'
+require 'airbrake/version'
+require 'airbrake/backtrace'
+require 'airbrake/notice'
+
+# MonkeyPatch to instanciate a Airbrake::Notice without configure
+# Airbrake
+#
+module Airbrake
+  API_VERSION = '2.4'
+
+  class Notice
+    def framework
+      'rails'
+    end
+  end
+end
+
+describe ErrorReport do
+  context "with notice without line of backtrace" do
+    let(:xml){
+      Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
+    }
+
+    let(:error_report) {
+      ErrorReport.new(xml)
+    }
+
+    let!(:app) {
+      Fabricate(
+        :app,
+        :api_key => 'APIKEY'
+      )
+    }
+
+    describe "#app" do
+      it 'find the good app' do
+        expect(error_report.app).to eq app
+      end
+    end
+
+    describe "#backtrace" do
+
+      it 'should have valid backtrace' do
+        error_report.backtrace.should be_valid
+      end
+    end
+
+    describe "#generate_notice!" do
+      it "save a notice" do
+        expect {
+          error_report.generate_notice!
+        }.to change {
+          app.reload.problems.count
+        }.by(1)
+      end
+      context "with notice generate by Airbrake gem" do
+        let(:xml) { Airbrake::Notice.new(
+          :exception => Exception.new,
+          :api_key => 'APIKEY',
+          :project_root => Rails.root
+        ).to_xml }
+        it 'save a notice' do
+          expect {
+            error_report.generate_notice!
+          }.to change {
+            app.reload.problems.count
+          }.by(1)
+        end
+      end
+
+      describe "notice create" do
+        before { error_report.generate_notice! }
+        subject { error_report.notice }
+        its(:message) { 'HoptoadTestingException: Testing hoptoad via "rake hoptoad:test". If you can see this, it works.' }
+        its(:framework) { should == 'Rails: 3.2.11' }
+
+        it 'has complete backtrace' do
+          subject.backtrace_lines.size.should == 73
+          subject.backtrace_lines.last['file'].should == '[GEM_ROOT]/bin/rake'
+        end
+        it 'has server_environement' do
+          subject.server_environment['environment-name'].should == 'development'
+        end
+
+        it 'has request' do
+          subject.request['url'].should == 'http://example.org/verify'
+          subject.request['params']['controller'].should == 'application'
+        end
+
+        it 'has notifier' do
+          subject.notifier['name'].should == 'Hoptoad Notifier'
+        end
+
+        it 'get user_attributes' do
+          subject.user_attributes['id'].should == '123'
+          subject.user_attributes['name'].should == 'Mr. Bean'
+          subject.user_attributes['email'].should == 'mr.bean@example.com'
+          subject.user_attributes['username'].should == 'mrbean'
+        end
+        it 'valid env_vars' do
+        # XML: <var key="SCRIPT_NAME"/>
+        subject.env_vars.should have_key('SCRIPT_NAME')
+        subject.env_vars['SCRIPT_NAME'].should be_nil # blank ends up nil
+
+        # XML representation:
+        # <var key="rack.session.options">
+        #   <var key="secure">false</var>
+        #   <var key="httponly">true</var>
+        #   <var key="path">/</var>
+        #   <var key="expire_after"/>
+        #   <var key="domain"/>
+        #   <var key="id"/>
+        # </var>
+        expected = {
+          'secure'        => 'false',
+          'httponly'      => 'true',
+          'path'          => '/',
+          'expire_after'  => nil,
+          'domain'        => nil,
+          'id'            => nil
+        }
+        subject.env_vars.should have_key('rack_session_options')
+        subject.env_vars['rack_session_options'].should eql(expected)
+      end
+      end
+
+      it 'save a notice assignes to err' do
+        error_report.generate_notice!
+        error_report.notice.err.should be_a(Err)
+      end
+
+      it 'memoize the notice' do
+        expect {
+          error_report.generate_notice!
+          error_report.generate_notice!
+        }.to change {
+          Notice.count
+        }.by(1)
+      end
+
+      it 'find the correct err for the notice' do
+        err = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true))
+        
+        ErrorReport.any_instance.stub(:fingerprint).and_return(err.fingerprint)
+        
+        expect {
+          error_report.generate_notice!
+        }.to change {
+          error_report.error.resolved?
+        }.from(true).to(false)
+      end
+
+      context "with notification service configured" do
+        before do
+          app.notify_on_errs = true
+          app.watchers.build(:email => 'foo@example.com')
+          app.save
+        end
+        it 'send email' do
+          notice = error_report.generate_notice!
+          email = ActionMailer::Base.deliveries.last
+          email.to.should include(app.watchers.first.email)
+          email.subject.should include(notice.message.truncate(50))
+          email.subject.should include("[#{app.name}]")
+          email.subject.should include("[#{notice.environment_name}]")
+        end
+      end
+
+      context "with xml without request section" do
+        let(:xml){
+          Rails.root.join('spec','fixtures','hoptoad_test_notice_without_request_section.xml').read
+        }
+        it "save a notice" do
+          expect {
+            error_report.generate_notice!
+          }.to change {
+            app.reload.problems.count
+          }.by(1)
+        end
+      end
+
+      context "with xml with only a single line of backtrace" do
+        let(:xml){
+          Rails.root.join('spec','fixtures','hoptoad_test_notice_with_one_line_of_backtrace.xml').read
+        }
+        it "save a notice" do
+          expect {
+            error_report.generate_notice!
+          }.to change {
+            app.reload.problems.count
+          }.by(1)
+        end
+      end
+    end
+
+    describe "#valid?" do
+      context "with valid error report" do
+        it "return true" do
+          expect(error_report.valid?).to be true
+        end
+      end
+      context "with not valid api_key" do
+        before do
+          App.where(:api_key => app.api_key).delete_all
+        end
+        it "return false" do
+          expect(error_report.valid?).to be false
+        end
+      end
+    end
+
+    describe "#notice" do
+      context "before generate_notice!" do
+        it 'return nil' do
+          expect(error_report.notice).to be nil
+        end
+      end
+
+      context "after generate_notice!" do
+        before do
+          error_report.generate_notice!
+        end
+
+        it 'return the notice' do
+          expect(error_report.notice).to be_a Notice
+        end
+
+      end
+    end
+
+  end
+end
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+Fabrication::Config.fabricator_dir.each do |folder|
+  Dir.glob(File.join(Rails.root, folder, '**', '*.rb')).each do |file|
+    require file
+  end
+end
+
+describe "Fabrication" do
+  #TODO : when 1.8.7 drop support se directly Symbol#sort
+  Fabrication::Fabricator.schematics.keys.sort_by(&:to_s).each do |fabricator_name|
+    context "Fabricate(:#{fabricator_name})" do
+      subject { Fabricate.build(fabricator_name) }
+
+      it { should be_valid }
+    end
+  end
+end
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Fingerprint do
+
+  context '#generate' do
+    before do
+      @backtrace = Backtrace.find_or_create(:raw => [
+        {"number"=>"425", "file"=>"[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb", "method"=>"_run__2115867319__process_action__262109504__callbacks"},
+        {"number"=>"404", "file"=>"[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb", "method"=>"send"},
+        {"number"=>"404", "file"=>"[GEM_ROOT]/gems/activesupport-3.0.0.rc/lib/active_support/callbacks.rb", "method"=>"_run_process_action_callbacks"}
+      ])
+    end
+    
+    it 'should create the same fingerprint for two notices with the same backtrace' do
+      notice1 = Fabricate.build(:notice, :backtrace => @backtrace)
+      notice2 = Fabricate.build(:notice, :backtrace => @backtrace)
+      
+      Fingerprint.generate(notice1, "api key").should == Fingerprint.generate(notice2, "api key")
+    end
+  end
+
+end
+
@@ -26,16 +26,15 @@ describe IssueTrackers::BitbucketIssuesTracker do
 }
 EOF
-    stub_request(:post, "https://#{tracker.api_token}:#{tracker.project_id}@bitbucket.org/api/1.0/repositories/test_username/test_repo/issues/").to_return(:status => 200, :headers => {}, :body => body )
+    stub_request(:post, "https://#{tracker.api_token}:#{tracker.project_id}@bitbucket.org/api/1.0/repositories/test_user/test_repo/issues/").to_return(:status => 200, :headers => {}, :body => body )
     problem.app.issue_tracker.create_issue(problem)
     problem.reload
-    requested = have_requested(:post, "https://#{tracker.api_token}:#{tracker.project_id}@bitbucket.org/api/1.0/repositories/test_username/test_repo/issues/")
+    requested = have_requested(:post, "https://#{tracker.api_token}:#{tracker.project_id}@bitbucket.org/api/1.0/repositories/test_user/test_repo/issues/")
     WebMock.should requested.with(:title => /[production][foo#bar] FooError: Too Much Bar/)
     WebMock.should requested.with(:content => /See this exception on Errbit/)
     problem.issue_link.should == @issue_link
   end
 end
-
@@ -9,7 +9,7 @@ describe IssueTrackers::FogbugzTracker do
     number = 123
     @issue_link = "https://#{tracker.account}.fogbugz.com/default.asp?#{number}"
     response = "<response><token>12345</token><case><ixBug>123</ixBug></case></response>"
-    http_mock = mock
+    http_mock = double
     http_mock.should_receive(:new).and_return(http_mock)
     http_mock.should_receive(:request).twice.and_return(response)
     Fogbugz.adapter[:http] = http_mock
@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::GitlabTracker do
-  it "should create an issue on Gitlab with problem params" do
-    notice = Fabricate :notice
-    tracker = Fabricate :gitlab_tracker, :app => notice.app
-    problem = notice.problem
-
-    number = 5
-    @issue_link = "#{tracker.account}/#{tracker.project_id}/issues/#{number}/#{tracker.api_token}"
-    body = <<EOF
-{
-  "title": "Title"
-}
-EOF
-
-    stub_request(:post, "#{tracker.account}/#{tracker.project_id}/issues/#{tracker.api_token}").
-      to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested = have_requested(:post, "#{tracker.account}/#{tracker.project_id}/issues/#{tracker.api_token}")
-    WebMock.should requested.with(:body => /[production][foo#bar] FooError: Too Much Bar/)
-    WebMock.should requested.with(:body => /See this exception on Errbit/)
-
-    problem.issue_link.should == @issue_link
-  end
-end
-
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe IssueTrackers::GitlabTracker do
+  it "should create an issue on Gitlab with problem params" do
+    notice = Fabricate :notice
+    tracker = Fabricate :gitlab_tracker, :app => notice.app
+    problem = notice.problem
+
+    issue_id = 5
+    note_id = 10
+    issue_body = {:id => issue_id, :title => "[production][foo#bar] FooError: Too Much Bar", :description => "[See this exception on Errbit]"}.to_json
+    note_body = {:id => note_id, :body => "Example note body"}.to_json
+
+    stub_request(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues?private_token=#{tracker.api_token}").
+      with(:body => /.+/, :headers => {'Accept'=>'application/json'}).
+      to_return(:status => 200, :body => issue_body, :headers => {'Accept'=>'application/json'})
+
+    stub_request(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues/#{issue_id}/notes?private_token=#{tracker.api_token}").
+      with(:body => /.+/, :headers => {'Accept'=>'application/json'}).
+      to_return(:status => 200, :body => note_body, :headers => {'Accept'=>'application/json'})
+
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
+
+    requested_issue = have_requested(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues?private_token=#{tracker.api_token}").with(:body => /.+/, :headers => {'Accept'=>'application/json'})
+    requested_note = have_requested(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues/#{issue_id}/notes?private_token=#{tracker.api_token}")
+    WebMock.should requested_issue.with(:body => /%5Bproduction%5D%5Bfoo%23bar%5D%20FooError%3A%20Too%20Much%20Bar/)
+    WebMock.should requested_issue.with(:body => /See%20this%20exception%20on%20Errbit/)
+
+  end
+end
+
@@ -8,13 +8,17 @@ describe IssueTrackers::RedmineTracker do
     number = 5
     @issue_link = "#{tracker.account}/issues/#{number}.xml?project_id=#{tracker.project_id}"
     body = "<issue><subject>my subject</subject><id>#{number}</id></issue>"
-    stub_request(:post, "#{tracker.account}/issues.xml").
+
+    # Build base url with account URL, and username/password basic auth
+    base_url = tracker.account.gsub 'http://', "http://#{tracker.username}:#{tracker.password}@"
+
+    stub_request(:post, "#{base_url}/issues.xml").
                  to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
     problem.app.issue_tracker.create_issue(problem)
     problem.reload
-    requested = have_requested(:post, "#{tracker.account}/issues.xml")
+    requested = have_requested(:post, "#{base_url}/issues.xml")
     WebMock.should requested.with(:headers => {'X-Redmine-API-Key' => tracker.api_token})
     WebMock.should requested.with(:body => /<project-id>#{tracker.project_id}<\/project-id>/)
     WebMock.should requested.with(:body => /<subject>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/subject>/)
@@ -26,9 +30,9 @@ describe IssueTrackers::RedmineTracker do
   it "should generate a url where a file with line number can be viewed" do
     t = Fabricate(:redmine_tracker, :account => 'http://redmine.example.com', :project_id => "errbit")
     t.url_to_file("/example/file").should ==
-      'http://redmine.example.com/projects/errbit/repository/annotate/example/file'
+      'http://redmine.example.com/projects/errbit/repository/revisions/master/changes/example/file'
     t.url_to_file("/example/file", 25).should ==
-      'http://redmine.example.com/projects/errbit/repository/annotate/example/file#L25'
+      'http://redmine.example.com/projects/errbit/repository/revisions/master/changes/example/file#L25'
   end
   it "should use the alt_project_id to generate a file/linenumber url, if given" do
@@ -36,7 +40,6 @@ describe IssueTrackers::RedmineTracker do
                                   :project_id => "errbit",
                                   :alt_project_id => "actual_project")
     t.url_to_file("/example/file", 25).should ==
-      'http://redmine.example.com/projects/actual_project/repository/annotate/example/file#L25'
+      'http://redmine.example.com/projects/actual_project/repository/revisions/master/changes/example/file#L25'
   end
 end
-
@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe IssueTrackers::UnfuddleTracker do
+
+  let(:issue_link) { "https://test.unfuddle.com/projects/15/tickets/2436" }
+  let(:notice) { Fabricate :notice }
+  let(:tracker) { Fabricate :unfuddle_issues_tracker, :app => notice.app }
+  let(:problem) { notice.problem }
+
+  it "should create an issue on Unfuddle Issues with problem params, and set issue link for problem" do
+project_xml = <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <account-id type="integer">1</account-id>
+  <archived type="boolean">false</archived>
+  <assignee-on-resolve>reporter</assignee-on-resolve>
+  <backup-frequency type="integer">0</backup-frequency>
+  <close-ticket-simultaneously-default type="boolean">false</close-ticket-simultaneously-default>
+  <default-ticket-report-id type="integer" nil="true"></default-ticket-report-id>
+  <description nil="true"></description>
+  <disk-usage type="integer">27932</disk-usage>
+  <enable-time-tracking type="boolean">true</enable-time-tracking>
+  <id type="integer">#{tracker.project_id}</id>
+  <s3-access-key-id></s3-access-key-id>
+  <s3-backup-enabled type="boolean">false</s3-backup-enabled>
+  <s3-bucket-name></s3-bucket-name>
+  <short-name>test-project</short-name>
+  <theme>blue</theme>
+  <ticket-field1-active type="boolean">false</ticket-field1-active>
+  <ticket-field1-disposition>text</ticket-field1-disposition>
+  <ticket-field1-title>Field 1</ticket-field1-title>
+  <ticket-field2-active type="boolean">false</ticket-field2-active>
+  <ticket-field2-disposition>text</ticket-field2-disposition>
+  <ticket-field2-title>Field 2</ticket-field2-title>
+  <ticket-field3-active type="boolean">false</ticket-field3-active>
+  <ticket-field3-disposition>text</ticket-field3-disposition>
+  <ticket-field3-title>Field 3</ticket-field3-title>
+  <title>test-project</title>
+  <created-at>2011-04-25T09:21:43Z</created-at>
+  <updated-at>2013-03-08T08:03:02Z</updated-at>
+</project>
+EOF
+
+    ticket_xml =<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<ticket>
+  <assignee-id type="integer">40</assignee-id>
+  <component-id type="integer" nil="true"></component-id>
+  <description nil="true"></description>
+  <description-format>markdown</description-format>
+  <due-on type="date" nil="true"></due-on>
+  <field1-value-id type="integer" nil="true"></field1-value-id>
+  <field2-value-id type="integer" nil="true"></field2-value-id>
+  <field3-value-id type="integer" nil="true"></field3-value-id>
+  <hours-estimate-current type="float">1268.7</hours-estimate-current>
+  <hours-estimate-initial type="float">0.0</hours-estimate-initial>
+  <id type="integer">2436</id>
+  <milestone-id type="integer">78</milestone-id>
+  <number type="integer">119</number>
+  <priority>3</priority>
+  <project-id type="integer">15</project-id>
+  <reporter-id type="integer">40</reporter-id>
+  <resolution></resolution>
+  <resolution-description></resolution-description>
+  <resolution-description-format>markdown</resolution-description-format>
+  <severity-id type="integer" nil="true"></severity-id>
+  <status>reopened</status>
+  <summary>TEST-ticket.</summary>
+  <version-id type="integer" nil="true"></version-id>
+  <created-at>2012-06-27T17:49:06Z</created-at>
+  <updated-at>2013-03-07T16:04:05Z</updated-at>
+</ticket>
+EOF
+
+    stub_request(:get, "https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}.xml").
+      to_return(:status => 200, :body => project_xml, :headers => {})
+
+
+    stub_request(:post, "https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}/tickets.xml").
+      to_return(:status => 200, :body => ticket_xml, :headers => {})
+
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
+
+    requested = have_requested(:post,"https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}/tickets.xml" )
+    WebMock.should requested.with(:title => /[production][foo#bar] FooError: Too Much Bar/)
+    WebMock.should requested.with(:content => /See this exception on Errbit/)
+
+    problem.issue_link.should == issue_link
+    problem.issue_type.should == IssueTrackers::UnfuddleTracker::Label
+  end
+end
 require 'spec_helper'
-describe NoticeObserver do
+describe "Callback on Notice" do
   describe "email notifications (configured individually for each app)" do
     custom_thresholds = [2, 4, 8, 16, 32, 64]
@@ -18,12 +18,13 @@ describe NoticeObserver do
       it "sends an email notification after #{threshold} notice(s)" do
         @err.problem.stub(:notices_count).and_return(threshold)
         Mailer.should_receive(:err_notification).
-          and_return(mock('email', :deliver => true))
+          and_return(double('email', :deliver => true))
         Fabricate(:notice, :err => @err)
       end
     end
   end
+
   describe "email notifications for a resolved issue" do
     before do
       Errbit::Config.per_app_email_at_notices = true
@@ -38,12 +39,19 @@ describe NoticeObserver do
     it "should send email notification after 1 notice since an error has been resolved" do
       @err.problem.resolve!
       Mailer.should_receive(:err_notification).
-        and_return(mock('email', :deliver => true))
+        and_return(double('email', :deliver => true))
+      Fabricate(:notice, :err => @err)
+    end
+    it 'self notify if mailer failed' do
+      @err.problem.resolve!
+      Mailer.should_receive(:err_notification).
+        and_raise(ArgumentError)
+      HoptoadNotifier.should_receive(:notify)
       Fabricate(:notice, :err => @err)
     end
   end
-  describe "should send a notification if a notification service is configured" do
+  describe "should send a notification if a notification service is configured with defaults" do
     let(:app) { Fabricate(:app, :email_at_notices => [1], :notification_service => Fabricate(:campfire_notification_service))}
     let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => app, :notices_count => 100)) }
     let(:backtrace) { Fabricate(:backtrace) }
@@ -64,6 +72,30 @@ describe NoticeObserver do
     end
   end
+  describe "send a notification if a notification service is configured with defaults but failed" do
+    let(:app) { Fabricate(:app_with_watcher,
+                          :notify_on_errs => true,
+                          :email_at_notices => [1, 100], :notification_service => Fabricate(:campfire_notification_service))}
+    let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => app, :notices_count => 99)) }
+    let(:backtrace) { Fabricate(:backtrace) }
+
+    before do
+      Errbit::Config.per_app_email_at_notices = true
+    end
+
+    after do
+      Errbit::Config.per_app_email_at_notices = false
+    end
+
+    it "send email" do
+      app.notification_service.should_receive(:create_notification).and_raise(ArgumentError)
+      Mailer.should_receive(:err_notification).and_return(double(:deliver => true))
+
+      Notice.create!(:err => err, :message => 'FooError: Too Much Bar', :server_environment => {'environment-name' => 'production'},
+                     :backtrace => backtrace, :notifier => { 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com' })
+    end
+  end
+
   describe "should not send a notification if a notification service is not configured" do
     let(:app) { Fabricate(:app, :email_at_notices => [1], :notification_service => Fabricate(:notification_service))}
     let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => app, :notices_count => 100)) }
@@ -103,4 +135,41 @@ describe NoticeObserver do
       Fabricate(:notice, :err => err)
     end
   end
+
+  describe "should send a notification at desired intervals" do
+    let(:app) { Fabricate(:app, :email_at_notices => [1], :notification_service => Fabricate(:campfire_notification_service, :notify_at_notices => [1,2]))}
+    let(:backtrace) { Fabricate(:backtrace) }
+
+    before do
+      Errbit::Config.per_app_email_at_notices = true
+    end
+
+    after do
+      Errbit::Config.per_app_email_at_notices = false
+    end
+
+    it "should create a campfire notification on first notice" do
+      err = Fabricate(:err, :problem => Fabricate(:problem, :app => app, :notices_count => 1))
+      app.notification_service.should_receive(:create_notification)
+
+      Notice.create!(:err => err, :message => 'FooError: Too Much Bar', :server_environment => {'environment-name' => 'production'},
+                     :backtrace => backtrace, :notifier => { 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com' })
+    end
+
+    it "should create a campfire notification on second notice" do
+      err = Fabricate(:err, :problem => Fabricate(:problem, :app => app, :notices_count => 1))
+      app.notification_service.should_receive(:create_notification)
+
+      Notice.create!(:err => err, :message => 'FooError: Too Much Bar', :server_environment => {'environment-name' => 'production'},
+                     :backtrace => backtrace, :notifier => { 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com' })
+    end
+
+    it "should not create a campfire notification on third notice" do
+      err = Fabricate(:err, :problem => Fabricate(:problem, :app => app, :notices_count => 1))
+      app.notification_service.should_receive(:create_notification)
+
+      Notice.create!(:err => err, :message => 'FooError: Too Much Bar', :server_environment => {'environment-name' => 'production'},
+                     :backtrace => backtrace, :notifier => { 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com' })
+    end
+  end
 end
@@ -37,7 +37,9 @@ describe Notice do
   describe "user agent" do
     it "should be parsed and human-readable" do
-      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'}})
+      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'
+      }})
       notice.user_agent.browser.should == 'Chrome'
       notice.user_agent.version.to_s.should =~ /^10\.0/
     end
@@ -51,7 +53,7 @@ describe Notice do
   describe "user agent string" do
     it "should be parsed and human-readable" do
       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'}})
-      notice.user_agent_string.should == 'Chrome 10.0.648.204'
+      notice.user_agent_string.should == 'Chrome 10.0.648.204 (OS X 10.6.7)'
     end
     it "should be nil if HTTP_USER_AGENT is blank" do
@@ -8,7 +8,7 @@ describe NotificationService::CampfireService do
     problem = notice.problem
     #campy stubbing
-    campy = mock('CampfireService')
+    campy = double('CampfireService')
     Campy::Room.stub(:new).and_return(campy)
     campy.stub(:speak) { true }
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe NotificationServices::FlowdockService do
+  let(:service) { Fabricate.build(:flowdock_notification_service) }
+  let(:app) { Fabricate(:app, :name => 'App #3') }
+  let(:problem) { Fabricate(:problem, :app => app, :message => '<3') }
+
+  it 'sends message in appropriate format' do
+    Flowdock::Flow.any_instance.should_receive(:push_to_team_inbox) do |*args|
+      args.first[:content].should_not include('<3')
+      args.first[:content].should include('&lt;3')
+
+      args.first[:project].should eq('App3')
+    end
+    service.create_notification(problem)
+  end
+end
@@ -4,24 +4,122 @@ describe NotificationService::GtalkService do
   it "it should send a notification to gtalk" do
     # setup
     notice = Fabricate :notice
+    problem = notice.problem
     notification_service = Fabricate :gtalk_notification_service, :app => notice.app
     problem = notice.problem
     #gtalk stubbing
-    gtalk = mock('GtalkService')
+    gtalk = double('GtalkService')
+    jid = double("jid")
+    message = double("message")
+    Jabber::JID.should_receive(:new).with(notification_service.subdomain).and_return(jid)
+    Jabber::Client.should_receive(:new).with(jid).and_return(gtalk)
+    gtalk.should_receive(:connect).with(notification_service.service)
+    gtalk.should_receive(:auth).with(notification_service.api_token)
+    message_value = """#{problem.app.name.to_s}
+http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{notification_service.notification_description problem}"""
+
+    Jabber::Message.should_receive(:new).with(notification_service.user_id, message_value).and_return(message)
+    Jabber::Message.should_receive(:new).with(notification_service.room_id, message_value).and_return(message)
+
+    Jabber::MUC::SimpleMUCClient.should_receive(:new).and_return(gtalk)
+    gtalk.should_receive(:join).with(notification_service.room_id + "/errbit")
+
+    #assert
+    gtalk.should_receive(:send).exactly(2).times.with(message)
+
+    notification_service.create_notification(problem)
+  end
+
+  describe "multiple users_ids" do
+    before(:each) do
+      # setup
+      @notice = Fabricate :notice
+      @notification_service = Fabricate :gtalk_notification_service, :app => @notice.app
+      @problem = @notice.problem
+      @error_msg = """#{@problem.app.name.to_s}
+http://#{Errbit::Config.host}/apps/#{@problem.app.id.to_s}
+#{@notification_service.notification_description @problem}"""
+
+      # gtalk stubbing
+      @gtalk = double('GtalkService')
+      @gtalk.should_receive(:connect)
+      @gtalk.should_receive(:auth)
+      jid = double("jid")
+      Jabber::JID.stub(:new).with(@notification_service.subdomain).and_return(jid)
+      Jabber::Client.stub(:new).with(jid).and_return(@gtalk)
+    end
+    it "should send a notification to all ',' separated users" do
+      Jabber::Message.should_receive(:new).with("first@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("second@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("third@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("fourth@domain.org", @error_msg)
+      Jabber::MUC::SimpleMUCClient.should_not_receive(:new)
+      @gtalk.should_receive(:send).exactly(4).times
+
+      @notification_service.user_id = "first@domain.org,second@domain.org, third@domain.org ,   fourth@domain.org  "
+      @notification_service.room_id = ""
+      @notification_service.create_notification(@problem)
+    end
+    it "should send a notification to all ';' separated users" do
+      Jabber::Message.should_receive(:new).with("first@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("second@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("third@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("fourth@domain.org", @error_msg)
+      Jabber::MUC::SimpleMUCClient.should_not_receive(:new)
+      @gtalk.should_receive(:send).exactly(4).times
+
+      @notification_service.user_id = "first@domain.org;second@domain.org; third@domain.org ;   fourth@domain.org  "
+      @notification_service.room_id = ""
+      @notification_service.create_notification(@problem)
+    end
+    it "should send a notification to all ' ' separated users" do
+      Jabber::Message.should_receive(:new).with("first@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("second@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("third@domain.org", @error_msg)
+      Jabber::Message.should_receive(:new).with("fourth@domain.org", @error_msg)
+      Jabber::MUC::SimpleMUCClient.should_not_receive(:new)
+      @gtalk.should_receive(:send).exactly(4).times
+
+      @notification_service.user_id = "first@domain.org second@domain.org  third@domain.org     fourth@domain.org  "
+      @notification_service.room_id = ""
+      @notification_service.create_notification(@problem)
+    end
+
+  end
+
+  it "it should send a notification to room only" do
+    # setup
+    notice = Fabricate :notice
+    problem = notice.problem
+    notification_service = Fabricate :gtalk_notification_service, :app => notice.app
+    problem = notice.problem
+
+    #gtalk stubbing
+    gtalk = double('GtalkService')
     jid = double("jid")
     message = double("message")
     Jabber::JID.should_receive(:new).with(notification_service.subdomain).and_return(jid)
     Jabber::Client.should_receive(:new).with(jid).and_return(gtalk)
     gtalk.should_receive(:connect)
     gtalk.should_receive(:auth).with(notification_service.api_token)
-    Jabber::Message.should_receive(:new).with(notification_service.room_id, "[errbit] http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s} #{notification_service.notification_description problem}").and_return(message)
+    message_value = """#{problem.app.name.to_s}
+http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}
+#{notification_service.notification_description problem}"""
+
+    Jabber::Message.should_receive(:new).with(notification_service.room_id, message_value).and_return(message)
+
+    Jabber::MUC::SimpleMUCClient.should_receive(:new).and_return(gtalk)
+    gtalk.should_receive(:join).with(notification_service.room_id + "/errbit")
+
+    notification_service.user_id = ""
     #assert
     gtalk.should_receive(:send).with(message)
-
     notification_service.create_notification(problem)
   end
+
 end
@@ -15,7 +15,7 @@ describe NotificationServices::HipchatService do
   end
   it 'escapes html in message' do
-    service.stub(:notification_description => '<3')
+    problem.stub(:message => '<3')
     room.should_receive(:send) do |_, message|
       message.should_not include('<3')
       message.should include('&lt;3')
@@ -8,7 +8,7 @@ describe NotificationService::HoiioService do
     problem = notice.problem
     # hoi stubbing
-    sms = mock('HoiioService')
+    sms = double('HoiioService')
     Hoi::SMS.stub(:new).and_return(sms)
     sms.stub(:send) { true }
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe NotificationService::HubotService do
+  it "it should send a notification to Hubot" do
+    # setup
+    notice = Fabricate :notice
+    notification_service = Fabricate :hubot_notification_service, :app => notice.app
+    problem = notice.problem
+
+    # faraday stubbing
+    HTTParty.should_receive(:post).with(notification_service.api_token, :body => {:message => an_instance_of(String), :room => notification_service.room_id}).and_return(true)
+
+    notification_service.create_notification(problem)
+  end
+end
@@ -8,7 +8,7 @@ describe NotificationService::PushoverService do
     problem = notice.problem
     # hoi stubbing
-    notification = mock('PushoverService')
+    notification = double('PushoverService')
     Rushover::Client.stub(:new).and_return(notification)
     notification.stub(:notify) { true }
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe NotificationService::WebhookService do
+  it "it should send a notification to a user-specified URL" do
+    notice = Fabricate :notice
+    notification_service = Fabricate :webhook_notification_service, :app => notice.app
+    problem = notice.problem
+    
+    HTTParty.should_receive(:post).with(notification_service.api_token, :body => {:problem => problem.to_json}).and_return(true)
+
+    notification_service.create_notification(problem)
+  end
+end
 require 'spec_helper'
 describe Problem do
+
+  context 'validations' do
+    it 'requires an environment' do
+      err = Fabricate.build(:problem, :environment => nil)
+      err.should_not be_valid
+      err.errors[:environment].should include("can't be blank")
+    end
+  end
+
   describe "Fabrication" do
     context "Fabricate(:problem)" do
-      it 'should be valid' do
-        Fabricate.build(:problem).should be_valid
-      end
       it 'should have no comment' do
         lambda do
           Fabricate(:problem)
@@ -14,15 +20,20 @@ describe Problem do
     end
     context "Fabricate(:problem_with_comments)" do
-      it 'should be valid' do
-        Fabricate.build(:problem_with_comments).should be_valid
-      end
       it 'should have 3 comments' do
         lambda do
           Fabricate(:problem_with_comments)
         end.should change(Comment, :count).by(3)
       end
     end
+
+    context "Fabricate(:problem_with_errs)" do
+      it 'should have 3 errs' do
+        lambda do
+          Fabricate(:problem_with_errs)
+        end.should change(Err, :count).by(3)
+      end
+    end
   end
   context '#last_notice_at' do
@@ -46,14 +57,13 @@ describe Problem do
       problem.should_not be_nil
       notice1 = Fabricate(:notice, :err => err)
-      problem.first_notice_at.should == notice1.created_at
+      expect(problem.first_notice_at.to_i).to be_within(1).of(notice1.created_at.to_i)
       notice2 = Fabricate(:notice, :err => err)
-      problem.first_notice_at.should == notice1.created_at
+      expect(problem.first_notice_at.to_i).to be_within(1).of(notice1.created_at.to_i)
     end
   end
-
   context '#message' do
     it "adding a notice caches its message" do
       err = Fabricate(:err)
@@ -64,7 +74,6 @@ describe Problem do
     end
   end
-
   context 'being created' do
     context 'when the app has err notifications set to false' do
       it 'should not send an email notification' do
@@ -75,7 +84,6 @@ describe Problem do
     end
   end
-
   context "#resolved?" do
     it "should start out as unresolved" do
       problem = Problem.new
@@ -91,7 +99,6 @@ describe Problem do
     end
   end
-
   context "resolve!" do
     it "marks the problem as resolved" do
       problem = Fabricate(:problem)
@@ -102,7 +109,7 @@ describe Problem do
     it "should record the time when it was resolved" do
       problem = Fabricate(:problem)
-      expected_resolved_at = Time.now
+      expected_resolved_at = Time.zone.now
       Timecop.freeze(expected_resolved_at) do
         problem.resolve!
       end
@@ -121,12 +128,12 @@ describe Problem do
     it "should throw an err if it's not successful" do
       problem = Fabricate(:problem)
       problem.should_not be_resolved
-      problem.stub!(:valid?).and_return(false)
+      problem.stub(:valid?).and_return(false)
       ## update_attributes not test #valid? but #errors.any?
       # https://github.com/mongoid/mongoid/blob/master/lib/mongoid/persistence.rb#L137
       er = ActiveModel::Errors.new(problem)
       er.add_on_blank(:resolved)
-      problem.stub!(:errors).and_return(er)
+      problem.stub(:errors).and_return(er)
       problem.should_not be_valid
       lambda {
         problem.resolve!
@@ -134,22 +141,6 @@ describe Problem do
     end
   end
-
-  context ".merge!" do
-    it "collects the Errs from several problems into one and deletes the other problems" do
-      problem1 = Fabricate(:err).problem
-      problem2 = Fabricate(:err).problem
-      problem1.errs.length.should == 1
-      problem2.errs.length.should == 1
-
-      lambda {
-        merged_problem = Problem.merge!(problem1, problem2)
-        merged_problem.reload.errs.length.should == 2
-      }.should change(Problem, :count).by(-1)
-    end
-  end
-
-
   context "#unmerge!" do
     it "creates a separate problem for each err" do
       problem1 = Fabricate(:notice).problem
@@ -166,7 +157,6 @@ describe Problem do
     end
   end
-
   context "Scopes" do
     context "resolved" do
       it 'only finds resolved Problems' do
@@ -185,8 +175,22 @@ describe Problem do
         Problem.unresolved.all.should include(unresolved)
       end
     end
-  end
+    context "searching" do
+      it 'finds the correct record' do
+        find = Fabricate(:problem, :resolved => false, :error_class => 'theErrorclass::other',
+                         :message => "other", :where => 'errorclass', :environment => 'development', :app_name => 'other')
+        dont_find = Fabricate(:problem, :resolved => false, :error_class => "Batman",
+                              :message => 'todo', :where => 'classerror', :environment => 'development', :app_name => 'other')
+        Problem.search("theErrorClass").unresolved.should include(find)
+        Problem.search("theErrorClass").unresolved.should_not include(dont_find)
+      end
+      it 'find on where message' do
+        problem = Fabricate(:problem, :where => 'cyril')
+        Problem.search('cyril').entries.should eq [problem]
+      end
+    end
+  end
   context "notice counter cache" do
     before do
@@ -202,19 +206,18 @@ describe Problem do
     it "adding a notice increases #notices_count by 1" do
       lambda {
         Fabricate(:notice, :err => @err, :message => 'ERR 1')
-      }.should change(@problem, :notices_count).from(0).to(1)
+      }.should change(@problem.reload, :notices_count).from(0).to(1)
     end
     it "removing a notice decreases #notices_count by 1" do
       notice1 = Fabricate(:notice, :err => @err, :message => 'ERR 1')
-      lambda {
+      expect {
         @err.notices.first.destroy
         @problem.reload
-      }.should change(@problem, :notices_count).from(1).to(0)
+      }.to change(@problem, :notices_count).from(1).to(0)
     end
   end
-
   context "#app_name" do
     let!(:app) { Fabricate(:app) }
     let!(:problem) { Fabricate(:problem, :app => app) }
@@ -328,7 +331,7 @@ describe Problem do
     it "adding a notice adds a string to #user_agents" do
       lambda {
         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'}})
-      }.should change(@problem, :user_agents).from({}).to({Digest::MD5.hexdigest('Chrome 10.0.648.204') => {'value' => 'Chrome 10.0.648.204', 'count' => 1}})
+      }.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}})
     end
     it "removing a notice removes string from #user_agents" do
@@ -336,7 +339,9 @@ describe Problem do
       lambda {
         @err.notices.first.destroy
         @problem.reload
-      }.should change(@problem, :user_agents).from({Digest::MD5.hexdigest('Chrome 10.0.648.204') => {'value' => 'Chrome 10.0.648.204', 'count' => 1}}).to({})
+      }.should change(@problem, :user_agents).from({
+        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}
+      }).to({})
     end
   end
@@ -29,6 +29,15 @@ describe User do
       user2.should_not be_valid
       user2.errors[:github_login].should include("is already taken")
     end
+
+    it 'allows blank / null github_login' do
+      user1 = Fabricate(:user, :github_login => ' ')
+      user1.should be_valid
+
+      user2 = Fabricate.build(:user, :github_login => ' ')
+      user2.save
+      user2.should be_valid
+    end
   end
   context 'Watchers' do
@@ -40,15 +49,6 @@ describe User do
       user.watchers.should include(watcher)
     end
-    it "destroys any related watchers when it is destroyed" do
-      user = Fabricate(:user)
-      app  = Fabricate(:app)
-      watcher = Fabricate(:user_watcher, :app => app, :user => user)
-      user.watchers.should_not be_empty
-      user.destroy
-      app.reload.watchers.should_not include(watcher)
-    end
-
     it "has many apps through watchers" do
       user = Fabricate(:user)
       watched_app  = Fabricate(:app)
@@ -62,10 +62,12 @@ describe User do
   context "First user" do
     it "should be created this admin access via db:seed" do
-      require 'rake'
-      Errbit::Application.load_tasks
-      Rake::Task["db:seed"].execute
-      User.first.admin.should be_true
+      expect {
+        $stdout.stub(:puts => true)
+        require Rails.root.join('db/seeds.rb')
+      }.to change {
+        User.where(:admin => true).count
+      }.from(0).to(1)
     end
   end
@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe "Notices management" do
+
+  let(:errbit_app) { Fabricate(:app,
+                       :api_key => 'APIKEY') }
+
+  describe "create a new notice" do
+    context "with valide notice" do
+      let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
+      it 'save a new notice' do
+        expect {
+          post '/notifier_api/v2/notices', :data => xml
+          expect(response).to be_success
+        }.to change {
+          errbit_app.problems.count
+        }.by(1)
+      end
+    end
+
+    context "with notice with empty backtrace" do
+      let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice_without_line_of_backtrace.xml').read }
+      it 'save a new notice' do
+        expect {
+          post '/notifier_api/v2/notices', :data => xml
+          expect(response).to be_success
+        }.to change {
+          errbit_app.problems.count
+        }.by(1)
+      end
+    end
+
+    context "with notice with bad api_key" do
+      let(:errbit_app) { Fabricate(:app) }
+      let(:xml) { Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read }
+      it 'not save a new notice and return 422' do
+        expect {
+          post '/notifier_api/v2/notices', :data => xml
+          expect(response.status).to eq 422
+          expect(response.body).to eq "Your API key is unknown"
+        }.to_not change {
+          errbit_app.problems.count
+        }.by(1)
+      end
+
+    end
+
+  end
+
+end
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
+
+if ENV['COVERAGE']
+  require 'coveralls'
+  require 'simplecov'
+  Coveralls.wear!('rails') do
+    add_filter 'bundle'
+  end
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.start('rails') do
+    add_filter 'bundle'
+  end
+end
+
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'database_cleaner'
 require 'webmock/rspec'
 require 'xmpp4r'
+require 'xmpp4r/muc'
+require 'mongoid-rspec'
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -18,6 +37,7 @@ end
 RSpec.configure do |config|
   config.mock_with :rspec
   config.include Devise::TestHelpers, :type => :controller
+  config.include Mongoid::Matchers, :type => :model
   config.filter_run :focused => true
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true
@@ -27,6 +47,16 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
   config.include WebMock::API
+
+  config.include Haml, :type => :helper
+  config.include Haml::Helpers, :type => :helper
+  config.before(:each, :type => :helper) do |config|
+    init_haml_helpers
+  end
+
+  config.after(:all) do
+    WebMock.disable_net_connect! :allow => /coveralls\.io/
+  end
 end
 OmniAuth.config.test_mode = true
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe "apps/edit.html.haml" do
+  let(:app) { stub_model(App) }
+  before do
+    view.stub(:app).and_return(app)
+    controller.stub(:current_user) { stub_model(User) }
+  end
+
+  describe "content_for :action_bar" do
+    def action_bar
+      view.content_for(:action_bar)
+    end
+
+    it "should confirm the 'destroy' link" do
+      render
+
+      action_bar.should have_selector('a.button[data-confirm="Seriously?"]')
+    end
+
+  end
+
+  context "with unvalid app" do
+    let(:app) {
+      app = stub_model(App)
+      app.errors.add(:base,'You must specify your')
+      app
+    }
+
+    it 'see the error' do
+      render
+      rendered.should match(/You must specify your/)
+    end
+  end
+
+end
+
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
 describe "apps/index.html.haml" do
   before do
     app = stub_model(App, :deploys => [stub_model(Deploy, :created_at => Time.now, :revision => "123456789abcdef")])
-    assign :apps, [app]
+    view.stub(:apps).and_return([app])
     controller.stub(:current_user) { stub_model(User) }
   end
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe "apps/new.html.haml" do
+  let(:app) { stub_model(App) }
+  before do
+    view.stub(:app).and_return(app)
+    controller.stub(:current_user) { stub_model(User) }
+  end
+
+  describe "content_for :action_bar" do
+    def action_bar
+      view.content_for(:action_bar)
+    end
+
+    it "should confirm the 'cancel' link" do
+      render
+
+      action_bar.should have_selector('a.button', :text => 'cancel')
+    end
+
+  end
+
+  context "with unvalid app" do
+    let(:app) {
+      app = stub_model(App)
+      app.errors.add(:base,'You must specify your')
+      app
+    }
+
+    it 'see the error' do
+      render
+      rendered.should match(/You must specify your/)
+    end
+  end
+
+end
+
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "apps/show.atom.builder" do
+  let(:app) { stub_model(App) }
+  let(:problems) { [
+    stub_model(Problem, :message => 'foo', :app => app)
+  ]}
+
+  before do
+    view.stub(:app).and_return(app)
+    view.stub(:problems).and_return(problems)
+  end
+
+  context "with errs" do
+    it 'see the errs message' do
+      render
+      expect(rendered).to match(problems.first.message)
+    end
+  end
+
+end
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "apps/show.html.haml" do
+  let(:app) { stub_model(App) }
+  before do
+    view.stub(:app).and_return(app)
+    view.stub(:all_errs).and_return(false)
+    view.stub(:deploys).and_return([])
+    controller.stub(:current_user) { stub_model(User) }
+  end
+
+  describe "content_for :action_bar" do
+    def action_bar
+      view.content_for(:action_bar)
+    end
+
+    it "should confirm the 'cancel' link" do
+      render
+
+      action_bar.should have_selector('a.button', :text => 'all errs')
+    end
+
+  end
+
+  context "without errs" do
+    it 'see no errs' do
+      render
+      rendered.should match(/No errs have been/)
+    end
+  end
+end
+
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "notices/_summary.html.haml" do
+  let(:notice) { Fabricate(:notice, :framework => 'Rails 3.2.11') }
+
+  it "renders application framework" do
+    render "notices/summary", :notice => notice, :problem => notice.problem
+
+    rendered.should have_content('Rails 3.2.11')
+  end
+end
+
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "problems/index.atom.builder" do
+
+  it 'display problem message' do
+    app = App.new(:new_record => false)
+    view.stub(:problems).and_return([Problem.new(
+      :message => 'foo',
+      :new_record => false, :app => app), Problem.new(:new_record => false, :app => app)])
+    render
+    rendered.should match('foo')
+  end
+
+end
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "problems/index.html.haml" do
+  let(:problem_1) { Fabricate(:problem) }
+  let(:problem_2) { Fabricate(:problem, :app => problem_1.app) }
+
+  before do
+    # view.stub(:app).and_return(problem.app)
+    view.stub(:selected_problems).and_return([])
+    view.stub(:problems).and_return(Kaminari.paginate_array([problem_1, problem_2]).page(1).per(10))
+    view.stub(:params_sort).and_return('asc')
+    controller.stub(:current_user) { Fabricate(:user) }
+  end
+
+  describe "with problem" do
+    before { problem_1 && problem_2 }
+
+    it 'should works' do
+      render
+      rendered.should have_selector('div#problem_table.problem_table')
+    end
+  end
+
+end
+
 require 'spec_helper'
 describe "problems/show.html.haml" do
+  let(:problem) { Fabricate(:problem) }
+  let(:comment) { Fabricate(:comment) }
+
   before do
-    problem = Fabricate(:problem)
-    comment = Fabricate(:comment)
-    assign :problem, problem
+    view.stub(:app).and_return(problem.app)
+    view.stub(:problem).and_return(problem)
+
     assign :comment, comment
-    assign :app, problem.app
     assign :notices, problem.notices.page(1).per(1)
     assign :notice, problem.notices.first
+
     controller.stub(:current_user) { Fabricate(:user) }
   end
   def with_issue_tracker(tracker, problem)
     problem.app.issue_tracker = tracker.new :api_token => "token token token", :project_id => "1234"
-    assign :problem, problem
-    assign :app, problem.app
+    view.stub(:problem).and_return(problem)
+    view.stub(:app).and_return(problem.app)
   end
   describe "content_for :action_bar" do
@@ -54,8 +57,8 @@ describe &quot;problems/show.html.haml&quot; do
     it "should link 'up' to app_problems_path if HTTP_REFERER isn't set'" do
       controller.request.env['HTTP_REFERER'] = nil
       problem = Fabricate(:problem_with_comments)
-      assign :problem, problem
-      assign :app, problem.app
+      view.stub(:problem).and_return(problem)
+      view.stub(:app).and_return(problem.app)
       render
       action_bar.should have_selector("span a.up[href='#{app_problems_path(problem.app)}']", :text => 'up')
@@ -67,8 +70,8 @@ describe &quot;problems/show.html.haml&quot; do
         controller.stub(:current_user) { user }
         problem = Fabricate(:problem_with_comments, :app => Fabricate(:app, :github_repo => "test_user/test_repo"))
-        assign :problem, problem
-        assign :app, problem.app
+        view.stub(:problem).and_return(problem)
+        view.stub(:app).and_return(problem.app)
         render
         action_bar.should have_selector("span a.github_create.create-issue", :text => 'create issue')
@@ -77,12 +80,54 @@ describe &quot;problems/show.html.haml&quot; do
       it 'should allow creating issue for github if application has a github tracker' do
         problem = Fabricate(:problem_with_comments, :app => Fabricate(:app, :github_repo => "test_user/test_repo"))
         with_issue_tracker(GithubIssuesTracker, problem)
-        assign :problem, problem
-        assign :app, problem.app
+        view.stub(:problem).and_return(problem)
+        view.stub(:app).and_return(problem.app)
         render
         action_bar.should have_selector("span a.github_create.create-issue", :text => 'create issue')
       end
+
+      context "without issue tracker associate on app" do
+        let(:problem){ Problem.new(:new_record => false, :app => app) }
+        let(:app) { App.new(:new_record => false) }
+
+        it 'not see link to create issue' do
+          view.stub(:problem).and_return(problem)
+          view.stub(:app).and_return(problem.app)
+          render
+          expect(view.content_for(:action_bar)).to_not match(/create issue/)
+        end
+
+      end
+
+      context "with lighthouse tracker on app" do
+        let(:app) { App.new(:new_record => false, :issue_tracker => tracker ) }
+        let(:tracker) {
+          IssueTrackers::LighthouseTracker.new(:project_id => 'x')
+        }
+        context "with problem without issue link" do
+          let(:problem){ Problem.new(:new_record => false, :app => app) }
+          it 'not see link if no issue tracker' do
+            view.stub(:problem).and_return(problem)
+            view.stub(:app).and_return(problem.app)
+            render
+            expect(view.content_for(:action_bar)).to match(/create issue/)
+          end
+
+        end
+
+        context "with problem with issue link" do
+          let(:problem){ Problem.new(:new_record => false, :app => app, :issue_link => 'http://foo') }
+
+          it 'not see link if no issue tracker' do
+            view.stub(:problem).and_return(problem)
+            view.stub(:app).and_return(problem.app)
+            render
+            expect(view.content_for(:action_bar)).to_not match(/create issue/)
+          end
+        end
+
+      end
     end
   end
@@ -94,8 +139,8 @@ describe &quot;problems/show.html.haml&quot; do
     it 'should display comments and new comment form when no issue tracker' do
       problem = Fabricate(:problem_with_comments)
-      assign :problem, problem
-      assign :app, problem.app
+      view.stub(:problem).and_return(problem)
+      view.stub(:app).and_return(problem.app)
       render
       view.content_for(:comments).should include('Test comment')
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "problems/show.html.ics" do
+  let(:problem) { Fabricate(:problem) }
+  before do
+    view.stub(:problem).and_return(problem)
+  end
+
+  it 'should work' do
+    render :template => 'problems/show', :formats => [:ics], :handlers => [:haml]
+  end
+
+
+end
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'users/edit.html.haml' do
+  let(:user) { stub_model(User, :name => 'shingara') }
+  before {
+    view.stub(:current_user).and_return(user)
+    view.stub(:user).and_return(user)
+  }
+  it 'should have per_page option' do
+    render
+    expect(rendered).to match(/id="user_per_page"/)
+  end
+
+  it 'should have time_zone option' do
+    render
+    expect(rendered).to match(/id="user_time_zone"/)
+  end
+end
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'users/index.html.haml' do
+  let(:user) { stub_model(User) }
+  before {
+    view.stub(:current_user).and_return(user)
+    view.stub(:users).and_return(
+      Kaminari.paginate_array([user], :total_count => 1).page(1)
+    )
+  }
+  it 'should see users option' do
+    render
+    expect(rendered).to match(/class='user_list'/)
+  end
+
+end
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'users/new.html.haml' do
+  let(:user) { stub_model(User) }
+  before {
+    view.stub(:current_user).and_return(user)
+    view.stub(:user).and_return(user)
+  }
+  it 'should have per_page option' do
+    render
+    expect(rendered).to match(/id="user_per_page"/)
+  end
+
+  it 'should have time_zone option' do
+    render
+    expect(rendered).to match(/id="user_time_zone"/)
+  end
+end
 require 'spec_helper'
 describe 'users/show.html.haml' do
+
   let(:user) do
     stub_model(User, :created_at => Time.now, :email => "test@example.com")
   end
@@ -8,12 +9,12 @@ describe &#39;users/show.html.haml&#39; do
   before do
     Errbit::Config.stub(:github_authentication) { true }
     controller.stub(:current_user) { stub_model(User) }
+    view.stub(:user) { user }
   end
   context 'with GitHub authentication' do
     it 'shows github login' do
       user.github_login = 'test_user'
-      assign :user, user
       render
       rendered.should match(/GitHub/)
       rendered.should match(/test_user/)
@@ -21,7 +22,6 @@ describe &#39;users/show.html.haml&#39; do
     it 'does not show github if blank' do
       user.github_login = ' '
-      assign :user, user
       render
       rendered.should_not match(/GitHub/)
     end
@@ -30,7 +30,6 @@ describe &#39;users/show.html.haml&#39; do
   context "Linking GitHub account" do
     context 'viewing another user page' do
       it "doesn't show and github linking buttons if user is not current user" do
-        assign :user, user
         render
         view.content_for(:action_bar).should_not include('Link GitHub account')
         view.content_for(:action_bar).should_not include('Unlink GitHub account')
@@ -40,7 +39,6 @@ describe &#39;users/show.html.haml&#39; do
     context 'viewing own user page' do
       before do
         controller.stub(:current_user) { user }
-        assign :user, user
       end
       it 'shows link github button when no login or token' do
	@@ -13,3 +13,9 @@ config/newrelic.yml		@@ -13,3 +13,9 @@ config/newrelic.yml
13	*~	13	*~
14	*.rbc	14	*.rbc
15	.DS_Store	15	.DS_Store
		16	+*.rbx
		17	+bin
		18	+bundle
		19	+coverage
		20	+*#
		21	+.ruby-version
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	---colour
2	---tty
3	---drb
4	---format documentation
@@ -0,0 +1,155 @@		@@ -0,0 +1,155 @@
	1	+## 0.3.0 - Not released Yet
	2	+
	3	+### Improvements
	4	+
	5	+- [#515][] Update to Mongoid 3.1 ([@arthurnn][])
	6	+
	7	+
	8	+[#515]: https://github.com/errbit/errbit/issues/515
	9	+
	10	+## 0.2.1 - Not released Yet
	11	+
	12	+### Improvements
	13	+
	14	+- [#552][] Limite size of asset on errbit ([@tscolari][])
	15	+
	16	+### Bug Fixes
	17	+
	18	+- [#558][] Avoid failure if you remote bitbucket_rest_api gem
	19	+ ([@shingara][])
	20	+
	21	+[@shingara]: https://github.com/shingara
	22	+[@tscolari]: https://github.com/tscolari
	23	+
	24	+[#552]: https://github.com/errbit/errbit/issues/552
	25	+[#558]: https://github.com/errbit/errbit/issues/558
	26	+
	27	+## 0.2.0 - 2013-09-11
	28	+
	29	+### Improvements
	30	+
	31	+- Update some gems ([@shingara][])
	32	+- [#492][] Improve some Pjax call ([@nfedyashev][])
	33	+- [#428][] Add the support of Unfuddle Issue Tracker ([@parallel588][])
	34	+- Avoid to delete his own user ([@shingara][])
	35	+- [#456][] Avoid to delete admin access of current user logged ([@shingara][])
	36	+- [#253][] Refactor the Fingerprint generation ([@boblail][])
	37	+- [#508][] Merge comments to when you merge problems ([@shingara][])
	38	+- Update the Devise Gem to the last one ([@shingara][])
	39	+- [#524][] Add current user information on the notifer.js ([@roryf][])
	40	+- [#523][] Update javascript-stacktrace ([@aliscott][])
	41	+- [#516][] Add Jira Issue tracker ([@xenji][])
	42	+- [#512][] Add capabilities to configure the use of sendmail to send
	43	+ email from Errbit ([@shingara][])
	44	+- [#532][] Use https link in Gravatar if you use errbit on https
	45	+ ([@jeroenj][])
	46	+- [#536][] Order app by name by default ([@2called-chaos][])
	47	+- [#542][] Allow the MONGODB_URL env configuration about Mongodb ([@bacongobbler][])
	48	+- [#530][] Improve the flowdock notification ([@nfedyashev][])
	49	+- [#531][] Improve the HipChat notification message ([@brendonrapp][])
	50	+
	51	+
	52	+### Bug Fixes
	53	+
	54	+- [#343][] Fix the ical generation. ([@shingara][])
	55	+- [#503][] Fix issue on where the service_url choose never use. ([@nfedyashev][])
	56	+- [#506][] Fix issue on bitbucket issue tracker creation failed. ([@Gonzih][])
	57	+- [#514][] Add CDATA in xml return by Javascript. ([@mildavw][])
	58	+- [#517][] Javascript escape path from javascript Notifier. ([@roryf][])
	59	+- [#518][] Fix issue when you try launch task errbit:db:update_update_problem_attrs. ([@shingara][])
	60	+- [#526][] Fix issue of pagination after search. ([@shingara][])
	61	+- [#528][] Fix issue of action after search. ([@shingara][])
	62	+
	63	+## 0.1.0 - 2013-05-29
	64	+
	65	+### Improvements
	66	+
	67	+- [#474][] Improve message when access denied. ([@chadcf][])
	68	+- [#468][] Launch a repairDatabase in MongoDB database after launching
	69	+ the clear_resolved task. ([@shingara][])
	70	+- Update gem of Mongoid to 2.7.1
	71	+- Update gem of Mongo to 1.8.5
	72	+- [#457][] Add task information about db:seed in Readme. ([@mildavw][])
	73	+- Add support of Ruby 2.0.0
	74	+- [#475][] Return a HTTP 422 status code when you try push notice with
	75	+ bad api key. ([@shingara][])
	76	+- Return a 400 http status when you try put a notice without args.
	77	+ ([@shingara][])
	78	+- [#486][] Add confirms box when you do massive action. ([@manuelmeurer][])
	79	+- [#487][] Add specific template to redmine notification with less useless data. ([@tvdeyen][])
	80	+
	81	+### Bug fixes
	82	+
	83	+- [#469][] Fix issue about the documentation of new heroku addons usage.
	84	+ ([@adamjt][])
	85	+- [#455][] Avoid raising exception if you comment an exception and no
	86	+ other user are define to received this comment. ([@alvarobp][])
	87	+- [#453][] Fix ruby 2.0.0 incompatibilities with gem ([@SamSaffron][])
	88	+- [#476][] Fix javascript notifier issue with IE8 ([@sdepold][])
	89	+- [#466][] Fix not see problem if octokit gem not define ([@tamaloa][])
	90	+- [#460][] Fix issue when you try see user with gravatar activate but no
	91	+ email define to this user ([@ivanyv][])
	92	+- [#478][] Fix issue about calculation of statisque of problem after
	93	+ merge ([@shingara][])
	94	+
	95	+<!-- Issue fix -->
	96	+
	97	+[#253]: https://github.com/errbit/errbit/issues/253
	98	+[#343]: https://github.com/errbit/errbit/issues/343
	99	+[#428]: https://github.com/errbit/errbit/issues/428
	100	+[#453]: https://github.com/errbit/errbit/issues/453
	101	+[#455]: https://github.com/errbit/errbit/issues/455
	102	+[#456]: https://github.com/errbit/errbit/issues/456
	103	+[#457]: https://github.com/errbit/errbit/issues/457
	104	+[#460]: https://github.com/errbit/errbit/issues/460
	105	+[#466]: https://github.com/errbit/errbit/issues/466
	106	+[#468]: https://github.com/errbit/errbit/issues/468
	107	+[#469]: https://github.com/errbit/errbit/issues/469
	108	+[#474]: https://github.com/errbit/errbit/issues/474
	109	+[#475]: https://github.com/errbit/errbit/issues/475
	110	+[#476]: https://github.com/errbit/errbit/issues/476
	111	+[#478]: https://github.com/errbit/errbit/issues/478
	112	+[#487]: https://github.com/errbit/errbit/issues/487
	113	+[#486]: https://github.com/errbit/errbit/issues/486
	114	+[#492]: https://github.com/errbit/errbit/issues/492
	115	+[#503]: https://github.com/errbit/errbit/issues/503
	116	+[#506]: https://github.com/errbit/errbit/issues/506
	117	+[#508]: https://github.com/errbit/errbit/issues/508
	118	+[#514]: https://github.com/errbit/errbit/issues/514
	119	+[#516]: https://github.com/errbit/errbit/issues/516
	120	+[#517]: https://github.com/errbit/errbit/issues/517
	121	+[#524]: https://github.com/errbit/errbit/issues/524
	122	+[#526]: https://github.com/errbit/errbit/issues/526
	123	+[#528]: https://github.com/errbit/errbit/issues/528
	124	+[#530]: https://github.com/errbit/errbit/issues/530
	125	+[#531]: https://github.com/errbit/errbit/issues/531
	126	+[#532]: https://github.com/errbit/errbit/issues/532
	127	+[#542]: https://github.com/errbit/errbit/issues/542
	128	+
	129	+<!-- Contributor on Errbit Thanks to all of them -->
	130	+
	131	+[@2called-chaos]: https://github.com/2called-chaos
	132	+[@Gonzih]: https://github.com/Gonzih
	133	+[@SamSaffron]: https://github.com/SamSaffron
	134	+[@adamjt]: https://github.com/adamjt
	135	+[@aliscott]: http://github.com/aliscott
	136	+[@alvarobp]: https://github.com/alvarobp
	137	+[@arthurnn]: https://github.com/arthurnn
	138	+[@bacongobbler]: https://github.com/bacongobbler
	139	+[@boblail]: https://github.com/boblail
	140	+[@brendonrapp]: https://github.com/brendonrapp
	141	+[@chadcf]: https://github.com/chadcf
	142	+[@ivanyv]: https://github.com/ivanyv
	143	+[@jeroenj]: https://github.com/jeroenj
	144	+[@manuelmeurer]: https://github.com/manuelmeurer
	145	+[@mildavw]: https://github.com/mildavw
	146	+[@mildavw]: https://github.com/mildavw
	147	+[@nfedyashev]: https://github.com/nfedyashev
	148	+[@parallel588]: https://github.com/parallel588
	149	+[@roryf]: https://github.com/roryf
	150	+[@sdepold]: https://github.com/sdepold
	151	+[@shingara]: https://github.com/shingara
	152	+[@tamaloa]: https://github.com/tamaloa
	153	+[@tvdeyen]: https://github.com/tvdeyen
	154	+[@williamn]: https://github.com/williamn
	155	+[@xenji]: https://github.com/xenji
@@ -0,0 +1,75 @@		@@ -0,0 +1,75 @@
	1	+## 0.3.0 - Not released yet
	2	+
	3	+- [@arthurnn][]
	4	+- [@shingara][]
	5	+
	6	+[@shingara]: https://github.com/shingara
	7	+[@arthurnn]: https://github.com/arthurnn
	8	+
	9	+## 0.2.1 - Not released yet
	10	+
	11	+- [@shingara][]
	12	+- [@tscolari][]
	13	+
	14	+[@shingara]: https://github.com/shingara
	15	+[@tscolari]: https://github.com/tscolari
	16	+
	17	+## 0.2.0 - 2013-09-11
	18	+
	19	+- [@2called-chaos][]
	20	+- [@Gonzih][]
	21	+- [@aliscott][]
	22	+- [@arthurnn][]
	23	+- [@bacongobbler][]
	24	+- [@boblail][]
	25	+- [@brendonrapp][]
	26	+- [@jeroenj][]
	27	+- [@mildavw][]
	28	+- [@nfedyashev][]
	29	+- [@parallel588][]
	30	+- [@roryf][]
	31	+- [@shingara][]
	32	+- [@williamn][]
	33	+- [@xenji][]
	34	+
	35	+## 0.1.0 - 2013-05-29
	36	+
	37	+- [@manuelmeurer][]
	38	+- [@mildavw][]
	39	+- [@chadcf][]
	40	+- [@shingara][]
	41	+- [@tvdeyen][]
	42	+- [@adamjt][]
	43	+- [@alvarobp][]
	44	+- [@SamSaffron][]
	45	+- [@sdepold][]
	46	+- [@tamaloa][]
	47	+- [@ivanyv][]
	48	+
	49	+<!-- Contributor on Errbit Thanks to all of them -->
	50	+
	51	+[@2called-chaos]: https://github.com/2called-chaos
	52	+[@Gonzih]: https://github.com/Gonzih
	53	+[@SamSaffron]: https://github.com/SamSaffron
	54	+[@adamjt]: https://github.com/adamjt
	55	+[@aliscott]: http://github.com/aliscott
	56	+[@alvarobp]: https://github.com/alvarobp
	57	+[@arthurnn]: https://github.com/arthurnn
	58	+[@bacongobbler]: https://github.com/bacongobbler
	59	+[@boblail]: https://github.com/boblail
	60	+[@brendonrapp]: https://github.com/brendonrapp
	61	+[@chadcf]: https://github.com/chadcf
	62	+[@ivanyv]: https://github.com/ivanyv
	63	+[@jeroenj]: https://github.com/jeroenj
	64	+[@manuelmeurer]: https://github.com/manuelmeurer
	65	+[@mildavw]: https://github.com/mildavw
	66	+[@mildavw]: https://github.com/mildavw
	67	+[@nfedyashev]: https://github.com/nfedyashev
	68	+[@parallel588]: https://github.com/parallel588
	69	+[@roryf]: https://github.com/roryf
	70	+[@sdepold]: https://github.com/sdepold
	71	+[@shingara]: https://github.com/shingara
	72	+[@tamaloa]: https://github.com/tamaloa
	73	+[@tvdeyen]: https://github.com/tvdeyen
	74	+[@williamn]: https://github.com/williamn
	75	+[@xenji]: https://github.com/xenji
	@@ -1,264 +0,0 @@	@@ -1,264 +0,0 @@
1	-// jquery.pjax.js
2	-// copyright chris wanstrath
3	-// https://github.com/defunkt/jquery-pjax
4	-
5	-(function($){
6	-
7	-// When called on a link, fetches the href with ajax into the
8	-// container specified as the first parameter or with the data-pjax
9	-// attribute on the link itself.
10	-//
11	-// Tries to make sure the back button and ctrl+click work the way
12	-// you'd expect.
13	-//
14	-// Accepts a jQuery ajax options object that may include these
15	-// pjax specific options:
16	-//
17	-// container - Where to stick the response body. Usually a String selector.
18	-// $(container).html(xhr.responseBody)
19	-// push - Whether to pushState the URL. Defaults to true (of course).
20	-// replace - Want to use replaceState instead? That's cool.
21	-//
22	-// For convenience the first parameter can be either the container or
23	-// the options object.
24	-//
25	-// Returns the jQuery object
26	-$.fn.pjax = function( container, options ) {
27	- if ( options )
28	- options.container = container
29	- else
30	- options = $.isPlainObject(container) ? container : {container:container}
31	-
32	- // We can't persist $objects using the history API so we must use
33	- // a String selector. Bail if we got anything else.
34	- if ( options.container && typeof options.container !== 'string' ) {
35	- throw "pjax container must be a string selector!"
36	- return false
37	- }
38	-
39	- return this.live('click', function(event){
40	- // Middle click, cmd click, and ctrl click should open
41	- // links in a new tab as normal.
42	- if ( event.which > 1 \|\| event.metaKey )
43	- return true
44	-
45	- var defaults = {
46	- url: this.href,
47	- container: $(this).attr('data-pjax'),
48	- clickedElement: $(this),
49	- fragment: null
50	- }
51	-
52	- $.pjax($.extend({}, defaults, options))
53	-
54	- event.preventDefault()
55	- })
56	-}
57	-
58	-
59	-// Loads a URL with ajax, puts the response body inside a container,
60	-// then pushState()'s the loaded URL.
61	-//
62	-// Works just like $.ajax in that it accepts a jQuery ajax
63	-// settings object (with keys like url, type, data, etc).
64	-//
65	-// Accepts these extra keys:
66	-//
67	-// container - Where to stick the response body. Must be a String.
68	-// $(container).html(xhr.responseBody)
69	-// push - Whether to pushState the URL. Defaults to true (of course).
70	-// replace - Want to use replaceState instead? That's cool.
71	-//
72	-// Use it just like $.ajax:
73	-//
74	-// var xhr = $.pjax({ url: this.href, container: '#main' })
75	-// console.log( xhr.readyState )
76	-//
77	-// Returns whatever $.ajax returns.
78	-var pjax = $.pjax = function( options ) {
79	- var $container = $(options.container),
80	- success = options.success \|\| $.noop
81	-
82	- // We don't want to let anyone override our success handler.
83	- delete options.success
84	-
85	- // We can't persist $objects using the history API so we must use
86	- // a String selector. Bail if we got anything else.
87	- if ( typeof options.container !== 'string' )
88	- throw "pjax container must be a string selector!"
89	-
90	- options = $.extend(true, {}, pjax.defaults, options)
91	-
92	- if ( $.isFunction(options.url) ) {
93	- options.url = options.url()
94	- }
95	-
96	- options.context = $container
97	-
98	- options.success = function(data){
99	- if ( options.fragment ) {
100	- // If they specified a fragment, look for it in the response
101	- // and pull it out.
102	- var $fragment = $(data).find(options.fragment)
103	- if ( $fragment.length )
104	- data = $fragment.children()
105	- else
106	- return window.location = options.url
107	- } else {
108	- // If we got no data or an entire web page, go directly
109	- // to the page and let normal error handling happen.
110	- if ( !$.trim(data) \|\| /<html/i.test(data) )
111	- return window.location = options.url
112	- }
113	-
114	- // Make it happen.
115	- this.html(data)
116	-
117	- // If there's a <title> tag in the response, use it as
118	- // the page's title.
119	- var oldTitle = document.title,
120	- title = $.trim( this.find('title').remove().text() )
121	- if ( title ) document.title = title
122	-
123	- // No <title>? Fragment? Look for data-title and title attributes.
124	- if ( !title && options.fragment ) {
125	- title = $fragment.attr('title') \|\| $fragment.data('title')
126	- }
127	-
128	- var state = {
129	- pjax: options.container,
130	- fragment: options.fragment,
131	- timeout: options.timeout
132	- }
133	-
134	- // If there are extra params, save the complete URL in the state object
135	- var query = $.param(options.data)
136	- if ( query != "_pjax=true" )
137	- state.url = options.url + (/\?/.test(options.url) ? "&" : "?") + query
138	-
139	- if ( options.replace ) {
140	- window.history.replaceState(state, document.title, options.url)
141	- } else if ( options.push ) {
142	- // this extra replaceState before first push ensures good back
143	- // button behavior
144	- if ( !pjax.active ) {
145	- window.history.replaceState($.extend({}, state, {url:null}), oldTitle)
146	- pjax.active = true
147	- }
148	-
149	- window.history.pushState(state, document.title, options.url)
150	- }
151	-
152	- // Google Analytics support
153	- if ( (options.replace \|\| options.push) && window._gaq )
154	- _gaq.push(['_trackPageview'])
155	-
156	- // If the URL has a hash in it, make sure the browser
157	- // knows to navigate to the hash.
158	- var hash = window.location.hash.toString()
159	- if ( hash !== '' ) {
160	- window.location.href = hash
161	- }
162	-
163	- // Invoke their success handler if they gave us one.
164	- success.apply(this, arguments)
165	- }
166	-
167	- // Cancel the current request if we're already pjaxing
168	- var xhr = pjax.xhr
169	- if ( xhr && xhr.readyState < 4) {
170	- xhr.onreadystatechange = $.noop
171	- xhr.abort()
172	- }
173	-
174	- pjax.options = options
175	- pjax.xhr = $.ajax(options)
176	- $(document).trigger('pjax', [pjax.xhr, options])
177	-
178	- return pjax.xhr
179	-}
180	-
181	-
182	-pjax.defaults = {
183	- timeout: 650,
184	- push: true,
185	- replace: false,
186	- // We want the browser to maintain two separate internal caches: one for
187	- // pjax'd partial page loads and one for normal page loads. Without
188	- // adding this secret parameter, some browsers will often confuse the two.
189	- data: { _pjax: true },
190	- type: 'GET',
191	- dataType: 'html',
192	- beforeSend: function(xhr){
193	- this.trigger('pjax:start', [xhr, pjax.options])
194	- // start.pjax is deprecated
195	- this.trigger('start.pjax', [xhr, pjax.options])
196	- xhr.setRequestHeader('X-PJAX', 'true')
197	- },
198	- error: function(xhr, textStatus, errorThrown){
199	- if ( textStatus !== 'abort' )
200	- window.location = pjax.options.url
201	- },
202	- complete: function(xhr){
203	- this.trigger('pjax:end', [xhr, pjax.options])
204	- // end.pjax is deprecated
205	- this.trigger('end.pjax', [xhr, pjax.options])
206	- }
207	-}
208	-
209	-
210	-// Used to detect initial (useless) popstate.
211	-// If history.state exists, assume browser isn't going to fire initial popstate.
212	-var popped = ('state' in window.history), initialURL = location.href
213	-
214	-
215	-// popstate handler takes care of the back and forward buttons
216	-//
217	-// You probably shouldn't use pjax on pages with other pushState
218	-// stuff yet.
219	-$(window).bind('popstate', function(event){
220	- // Ignore inital popstate that some browsers fire on page load
221	- var initialPop = !popped && location.href == initialURL
222	- popped = true
223	- if ( initialPop ) return
224	-
225	- var state = event.state
226	-
227	- if ( state && state.pjax ) {
228	- var container = state.pjax
229	- if ( $(container+'').length )
230	- $.pjax({
231	- url: state.url \|\| location.href,
232	- fragment: state.fragment,
233	- container: container,
234	- push: false,
235	- timeout: state.timeout
236	- })
237	- else
238	- window.location = location.href
239	- }
240	-})
241	-
242	-
243	-// Add the state property to jQuery's event object so we can use it in
244	-// $(window).bind('popstate')
245	-if ( $.inArray('state', $.event.props) < 0 )
246	- $.event.props.push('state')
247	-
248	-
249	-// Is pjax supported by this browser?
250	-$.support.pjax =
251	- window.history && window.history.pushState && window.history.replaceState
252	- // pushState isn't reliable on iOS yet.
253	- && !navigator.userAgent.match(/(iPod\|iPhone\|iPad\|WebApps\/.+CFNetwork)/)
254	-
255	-
256	-// Fall back to normalcy for older browsers.
257	-if ( !$.support.pjax ) {
258	- $.pjax = function( options ) {
259	- window.location = $.isFunction(options.url) ? options.url() : options.url
260	- }
261	- $.fn.pjax = function() { return this }
262	-}
263	-
264	-})(jQuery);
1	/**	1	/**
2	* Unobtrusive scripting adapter for jQuery	2	* Unobtrusive scripting adapter for jQuery
3	*	3	*
4	- * Requires jQuery 1.6.0 or later.	4	+ * Requires jQuery 1.6.0. Not compatible to jquery > 1.9
5	* https://github.com/rails/jquery-ujs	5	* https://github.com/rails/jquery-ujs
6		6
7	* Uploading file using rails.js	7	* Uploading file using rails.js
	@@ -131,11 +131,11 @@		@@ -131,11 +131,11 @@
131	method = element.data('method');	131	method = element.data('method');
132	url = element.data('url');	132	url = element.data('url');
133	data = element.serialize();	133	data = element.serialize();
134	- if (element.data('params')) data = data + "&" + element.data('params');	134	+ if (element.data('params')) data = data + "&" + element.data('params');
135	} else {	135	} else {
136	method = element.data('method');	136	method = element.data('method');
137	url = element.attr('href');	137	url = element.attr('href');
138	- data = element.data('params') \|\| null;	138	+ data = element.data('params') \|\| null;
139	}	139	}
140		140
141	options = {	141	options = {
@@ -0,0 +1,41 @@		@@ -0,0 +1,41 @@
	1	+class Api::V1::StatsController < ApplicationController
	2	+ respond_to :json, :xml
	3	+
	4	+ # The stats API only requires an api_key for the given app.
	5	+ skip_before_filter :authenticate_user!
	6	+ before_filter :require_api_key_or_authenticate_user!
	7	+
	8	+ def app
	9	+ if problem = @app.problems.order_by(:last_notice_at.desc).first
	10	+ @last_error_time = problem.last_notice_at
	11	+ end
	12	+
	13	+ stats = {
	14	+ :name => @app.name,
	15	+ :last_error_time => @last_error_time,
	16	+ :unresolved_errors => @app.unresolved_count
	17	+ }
	18	+
	19	+ respond_to do \|format\|
	20	+ format.html { render :json => Yajl.dump(stats) } # render JSON if no extension specified on path
	21	+ format.json { render :json => Yajl.dump(stats) }
	22	+ format.xml { render :xml => stats }
	23	+ end
	24	+ end
	25	+
	26	+
	27	+ protected
	28	+
	29	+ def require_api_key_or_authenticate_user!
	30	+ if params[:api_key].present?
	31	+ if @app = App.where(:api_key => params[:api_key]).first
	32	+ return true
	33	+ end
	34	+ end
	35	+
	36	+ authenticate_user!
	37	+ end
	38	+
	39	+end
	40	+
	41	+
	@@ -13,12 +13,28 @@ class ApplicationController < ActionController::Base		@@ -13,12 +13,28 @@ class ApplicationController < ActionController::Base
13		13
14	rescue_from ActionController::RedirectBackError, :with => :redirect_to_root	14	rescue_from ActionController::RedirectBackError, :with => :redirect_to_root
15		15
		16	+ class StrongParametersWithEagerAttributesStrategy < DecentExposure::StrongParametersStrategy
		17	+ def attributes
		18	+ super
		19	+ @attributes \|\|= params[inflector.param_key] \|\| {}
		20	+ end
		21	+ end
		22	+
		23	+ decent_configuration do
		24	+ strategy StrongParametersWithEagerAttributesStrategy
		25	+ end
16		26
17	protected	27	protected
18		28
19		29
		30	+ ##
		31	+ # Check if the current_user is admin or not and redirect to root url if not
		32	+ #
20	def require_admin!	33	def require_admin!
21	- redirect_to_root unless user_signed_in? && current_user.admin?	34	+ unless user_signed_in? && current_user.admin?
		35	+ flash[:error] = "Sorry, you don't have permission to do that"
		36	+ redirect_to_root
		37	+ end
22	end	38	end
23		39
24	def redirect_to_root	40	def redirect_to_root
	@@ -30,4 +46,3 @@ protected		@@ -30,4 +46,3 @@ protected
30	end	46	end
31		47
32	end	48	end
33	-
1	class NoticesController < ApplicationController	1	class NoticesController < ApplicationController
2	- respond_to :xml	2	+
		3	+ class ParamsError < StandardError; end
3		4
4	skip_before_filter :authenticate_user!, :only => :create	5	skip_before_filter :authenticate_user!, :only => :create
5		6
		7	+ rescue_from ParamsError, :with => :bad_params
		8	+
6	def create	9	def create
7	# params[:data] if the notice came from a GET request, raw_post if it came via POST	10	# params[:data] if the notice came from a GET request, raw_post if it came via POST
8	- notice = App.report_error!(params[:data] \|\| request.raw_post)
9	- api_xml = notice.to_xml(:only => false, :methods => [:id]) do \|xml\|
10	- xml.url locate_url(notice.id, :host => Errbit::Config.host)	11	+ report = ErrorReport.new(notice_params)
		12	+
		13	+ if report.valid?
		14	+ report.generate_notice!
		15	+ api_xml = report.notice.to_xml(:only => false, :methods => [:id]) do \|xml\|
		16	+ xml.url locate_url(report.notice.id, :host => Errbit::Config.host)
		17	+ end
		18	+ render :xml => api_xml
		19	+ else
		20	+ render :text => "Your API key is unknown", :status => 422
11	end	21	end
12	- render :xml => api_xml
13	end	22	end
14		23
15	# Redirects a notice to the problem page. Useful when using User Information at Airbrake gem.	24	# Redirects a notice to the problem page. Useful when using User Information at Airbrake gem.
	@@ -17,4 +26,20 @@ class NoticesController < ApplicationController		@@ -17,4 +26,20 @@ class NoticesController < ApplicationController
17	problem = Notice.find(params[:id]).problem	26	problem = Notice.find(params[:id]).problem
18	redirect_to app_problem_path(problem.app, problem)	27	redirect_to app_problem_path(problem.app, problem)
19	end	28	end
		29	+
		30	+ private
		31	+
		32	+ def notice_params
		33	+ return @notice_params if @notice_params
		34	+ @notice_params = params[:data] \|\| request.raw_post
		35	+ if @notice_params.blank?
		36	+ raise ParamsError.new('Need a data params in GET or raw post data')
		37	+ end
		38	+ @notice_params
		39	+ end
		40	+
		41	+ def bad_params(exception)
		42	+ render :text => exception.message, :status => :bad_request
		43	+ end
		44	+
20	end	45	end
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+# Include to do a Search
	2	+# TODO: Need to be in a Dedicated Object ProblemsSearch with params like input
	3	+#
	4	+module ProblemsSearcher
	5	+ extend ActiveSupport::Concern
	6	+
	7	+ included do
	8	+
	9	+ expose(:params_sort) {
	10	+ unless %w{app message last_notice_at last_deploy_at count}.member?(params[:sort])
	11	+ "last_notice_at"
	12	+ else
	13	+ params[:sort]
	14	+ end
	15	+ }
	16	+
	17	+ expose(:params_order){
	18	+ unless %w{asc desc}.member?(params[:order])
	19	+ 'desc'
	20	+ else
	21	+ params[:order]
	22	+ end
	23	+ }
	24	+
	25	+ expose(:selected_problems) {
	26	+ Array(Problem.find(err_ids))
	27	+ }
	28	+
	29	+ expose(:err_ids) {
	30	+ (params[:problems] \|\| []).compact
	31	+ }
	32	+
	33	+ end
	34	+end