Commit Graph

7 Commits

Author SHA1 Message Date
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications
Conflicts:
	config/locales/ru.yml
2012-01-31 21:42:37 +06:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
Alexander Machehin bf4e4f02ed Right merge branch 'master' into 18-commit_comments
Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
	db/schema.rb
2012-01-17 15:52:46 +06:00
Alexander Machehin 69debdd83e fix tests for shared elements 2012-01-16 19:43:23 +06:00
Alexander Machehin bdc3b3a3d1 [refs #18] controller tests 2012-01-14 18:16:42 +06:00
Alexander Machehin 2b1fe79adc [refs #18] controller tests 2012-01-13 22:00:28 +06:00