Pavel Chipiga 050398c39f Merge branch 'master' into 263-refactoring ... Conflicts: db/schema.rb		2012-03-30 00:02:59 +03:00
..
controllers	Merge branch 'master' into 263-refactoring	2012-03-30 00:02:59 +03:00
factories	Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263	2012-03-29 23:34:22 +03:00
helpers	Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134	2012-03-22 19:11:12 +02:00
mailers	Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263	2012-03-29 23:34:22 +03:00
models	Merge branch 'master' into 263-refactoring	2012-03-30 00:02:59 +03:00
routing	Add magic encodings. Refs #95	2012-01-30 22:39:34 +02:00
support	[refs #263] Fix most of the failed tests	2012-03-22 19:48:28 +04:00
tests.git	[refs #18] controller tests	2012-01-13 22:00:28 +06:00
spec_helper.rb	Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263	2012-03-29 23:34:22 +03:00