Dmitriy Zaporozhets 32d7841b2c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

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

Conflicts:
	app/views/layouts/_head_panel.html.haml

2015-04-30 19:36:45 +03:00

..

assets

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-04-30 19:36:45 +03:00

controllers

Draft improvements to search layout

2015-04-28 12:48:42 +03:00

finders

Fix tests and unassigned filter for issues. Updated CHANGELOG

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

helpers

Merge branch 'footnotes-markdown' into 'master'

2015-04-29 17:17:20 +00:00

mailers

Remove duplicate settings for default_url_options

2015-04-25 19:46:04 -04:00

models

Merge branch 'rs-issue-2269' into 'master'

2015-04-28 08:34:34 +00:00

services

Revert "Added X-GitLab-Event header for web hooks"

2015-04-27 16:29:31 +03:00

uploaders

Fix URL to uploaded file.

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

views

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-04-30 19:36:45 +03:00

workers

Revert "Added X-GitLab-Event header for web hooks"

2015-04-27 16:29:31 +03:00