Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md

2015-06-12 11:16:28 +02:00

..

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

factories

Rename approve->approval. Add approval count to project

2015-06-09 15:57:34 +02:00

features

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

finders

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

fixtures

Add ExternalLinkFilter to Markdown pipeline

2015-05-27 15:39:08 -04:00

helpers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

javascripts

Add JS specs for Array extensions

2015-06-02 20:32:07 -04:00

lib

Add Git hook to validate maximum file size.

2015-06-09 10:23:38 +02:00

mailers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-12 11:16:28 +02:00

requests/api

Merge branch 'feature/ldap_group_link_api' into 'master'

2015-06-09 09:27:39 +00:00

routing

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

support

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-12 11:16:28 +02:00

tasks/gitlab

Merge branch 'fix-backup-spec-regexp' into 'master'

2015-04-03 08:49:47 +00:00

workers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-15 19:22:57 +03:00

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Fix factory

2015-06-05 12:05:37 +02:00

spec_helper.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-12 11:16:28 +02:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00