gitlab-org--gitlab-foss/app
Dmitriy Zaporozhets 940ed58e76
Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-11-12 13:19:35 +02:00
..
assets remove unused js 2014-11-06 22:34:41 +03:00
controllers Merge branch 'auth_duplication' into 'master' 2014-11-05 15:23:26 +00:00
finders Merge branch 'dashboard_issues_and_mr' into 'master' 2014-10-28 13:38:41 +00:00
helpers Merge branch 'add_issue_edited_timestamp' into 'master' 2014-11-12 11:02:25 +00:00
mailers Fix adminarea and emails for new membership logic 2014-09-15 10:57:02 +03:00
models Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments 2014-11-12 13:19:35 +02:00
services Refactor merge request refresh logic on push 2014-11-11 16:49:26 +02:00
uploaders Removed + '' + 2014-10-29 10:52:54 +01:00
views Merge branch 'add_issue_edited_timestamp' into 'master' 2014-11-12 11:02:25 +00:00
workers Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00