Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master ... Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb		2012-09-12 06:49:52 +03:00
..
assets	Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master	2012-09-12 06:49:52 +03:00
contexts	Changed filters to readable one. Styled some stuff	2012-08-30 22:15:34 +03:00
controllers	Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master	2012-09-12 06:49:52 +03:00
decorators	using blank?, much shorter	2012-09-10 17:32:31 +02:00
helpers	Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master	2012-09-12 06:49:52 +03:00
mailers	Capitlization of /gitlab/i normalized. #1367	2012-09-06 11:21:35 +03:00
models	Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master	2012-09-12 06:49:52 +03:00
observers	Application logger	2012-09-11 23:24:53 +03:00
roles	Merge pull request #1409 from riyad/update-votes	2012-09-11 23:08:19 -07:00
uploaders	Fully embrace Ruby 1.9 hash syntax	2012-08-10 18:25:15 -04:00
views	Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master	2012-09-12 06:49:52 +03:00
workers	System Hook: implemented	2012-07-19 00:25:10 +03:00