Dmitriy Zaporozhets c6f3f9bb33 Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq ...

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

Conflicts:
	app/views/projects/merge_requests/_form.html.haml

2014-10-02 12:50:29 +03:00

..

assets

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

2014-10-02 08:41:48 +02:00

controllers

Remove statement without effect.

2014-09-30 17:53:54 +02:00

finders

Fix finder and tests for new membership models

2014-09-15 16:45:28 +03:00

helpers

Merge pull request #7853 from Razer6/feature/html_pipeline

2014-10-02 11:18:40 +03:00

mailers

Fix adminarea and emails for new membership logic

2014-09-15 10:57:02 +03:00

models

Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq

2014-10-02 12:50:29 +03:00

services

Protect default branch by default.

2014-09-29 15:12:07 +02:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq

2014-10-02 12:50:29 +03:00

workers

Update post-receive worker for new format

2014-09-02 10:58:54 +03:00