Dmitriy Zaporozhets 2505300b7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/import/google_code_controller.rb

2015-04-21 15:36:58 +03:00

..

assets

Merge branch 'fix-cannot-move-project-error' into 'master'

2015-04-21 09:29:17 +00:00

controllers

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2015-04-21 15:36:58 +03:00

finders

Fix tests and unassigned filter for issues. Updated CHANGELOG

2015-03-27 00:27:51 -07:00

helpers

Fix merge request comments on files with multiple commits

2015-04-15 18:23:57 +02:00

mailers

Merge branch 'emailsonpush-replyto' into 'master'

2015-04-15 12:37:51 +00:00

models

Merge branch 'better-commit-mentions' into 'master'

2015-04-20 12:42:31 +00:00

services

Clean up code somewhat.

2015-04-17 11:03:33 +02:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Improve description of Google Code import user map.

2015-04-21 10:33:04 +02:00

workers

Merge branch 'google-code-import' into 'master'

2015-04-15 06:53:42 +00:00