Merge branch 'master' into mongoid-3

Cyril Mougel
2 parents ef3e49b6 7fa30d6c
Showing 4 changed files with 22 additions and 2 deletions Show diff stats
CHANGELOG.md
CONTRIBUTORS.md
db/migrate/20110422152027_move_notices_to_separate_collection.rb
db/migrate/20121005142110_regenerate_err_fingerprints.rb
@@ -12,17 +12,24 @@
 ### Improvements
 - [#552][] Limite size of asset on errbit ([@tscolari][])
+- [#562][] See the version number of errbit on footer ([@nashby][])
+- [#555][] Avoid same group by same error if other line of backtrace
+  instead of first change ([@shingara][])
 ### Bug Fixes
 - [#558][] Avoid failure if you remote bitbucket_rest_api gem
   ([@shingara][])
+- [#559][] Fix some issue on the migration with old database
+  ([@shingara][])
+[@nashby]: https://github.com/nashby
 [@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
+[#562]: https://github.com/errbit/errbit/issues/562
 ## 0.2.0 - 2013-09-11
@@ -8,9 +8,13 @@
 ## 0.2.1 - Not released yet
+- [@anicet][]
+- [@nashby][]
 - [@shingara][]
 - [@tscolari][]
+[@anicet]: https://github.com/anicet
+[@nashby]: https://github.com/nashby
 [@shingara]: https://github.com/shingara
 [@tscolari]: https://github.com/tscolari
@@ -21,6 +21,13 @@ class MoveNoticesToSeparateCollection &lt; Mongoid::Migration
       e.app.update_attribute(:notify_on_errs, old_notify)
       errs_coll.find({ "_id" => err['_id']}).update({ "$unset" => { "notices" => 1}})
     end
+    (
+      Problem.where(:environment => '') |
+      Problem.where(:environment => nil) |
+      Problem.where(:environment => {})
+    ).each {|pr|
+      pr.update_attributes(:environment => 'old')
+    }
     Rake::Task["errbit:db:update_notices_count"].invoke
     Rake::Task["errbit:db:update_problem_attrs"].invoke
   end
@@ -10,8 +10,10 @@ class RegenerateErrFingerprints &lt; Mongoid::Migration
           :environment => err.environment,
           :api_key     => err.app.api_key
         }
-        fingerprint = Digest::SHA1.hexdigest(fingerprint_source.to_s)
-        err.update_attribute(:fingerprint, fingerprint)
+        err.update_attribute(
+          :fingerprint,
+          Fingerprint.generate(err.notices.first, err.app.api_key)
+        )
       end
     end
   end
	@@ -21,6 +21,13 @@ class MoveNoticesToSeparateCollection < Mongoid::Migration		@@ -21,6 +21,13 @@ class MoveNoticesToSeparateCollection < Mongoid::Migration
21	e.app.update_attribute(:notify_on_errs, old_notify)	21	e.app.update_attribute(:notify_on_errs, old_notify)
22	errs_coll.find({ "_id" => err['_id']}).update({ "$unset" => { "notices" => 1}})	22	errs_coll.find({ "_id" => err['_id']}).update({ "$unset" => { "notices" => 1}})
23	end	23	end
		24	+ (
		25	+ Problem.where(:environment => '') \|
		26	+ Problem.where(:environment => nil) \|
		27	+ Problem.where(:environment => {})
		28	+ ).each {\|pr\|
		29	+ pr.update_attributes(:environment => 'old')
		30	+ }
24	Rake::Task["errbit:db:update_notices_count"].invoke	31	Rake::Task["errbit:db:update_notices_count"].invoke
25	Rake::Task["errbit:db:update_problem_attrs"].invoke	32	Rake::Task["errbit:db:update_problem_attrs"].invoke
26	end	33	end