Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee ...

# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb

2015-05-05 10:18:27 +02:00

..

files

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

2015-04-14 15:08:19 +03:00

issues

No magic numbers for issues filtering

2015-03-26 18:56:42 -07:00

merge_requests

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

2015-04-27 11:53:31 +03:00

milestones

Merge branch 'group_milestones' into 'master'

2014-07-01 07:18:15 +00:00

notes

Link cross-project cross-reference notes to correct project.

2015-04-24 12:30:36 +02:00

oauth2

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08:00

projects

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

2015-04-27 11:53:31 +03:00

search

Adding in snippet search functionality

2014-08-29 15:32:07 -04:00

archive_repository_service.rb

Add tests.

2015-03-31 13:37:21 +02:00

audit_event_service.rb

Audit log for deploy keys

2015-03-23 19:11:39 +02:00

base_service.rb

Enforce restricted visibilities for snippets

2015-03-08 17:57:08 -06:00

compare_service.rb

Comment typo.

2014-08-29 20:11:57 +02:00

create_branch_service.rb

Ecevute hooks and services when branches are created/deleted through web.

2015-03-13 16:07:02 +01:00

create_snippet_service.rb

Enforce restricted visibilities for snippets

2015-03-08 17:57:08 -06:00

create_tag_service.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

delete_branch_service.rb

Ecevute hooks and services when branches are created/deleted through web.

2015-03-13 16:07:02 +01:00

delete_tag_service.rb

Move tag deletion to service and execute hooks and services.

2015-03-13 16:07:08 +01:00

event_create_service.rb

Use PushDataBuilder where applicable.

2015-03-13 16:06:56 +01:00

git_push_service.rb

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

2015-04-27 11:53:31 +03:00

git_tag_push_service.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

gravatar_service.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

issuable_base_service.rb

Add labels notes

2015-02-08 22:35:41 +06:00

ldap_group_reset_service.rb

Fix EE code after membership refactoring

2014-10-03 14:09:07 +03:00

notification_service.rb

No longer needed to pass project argument to commit methods.

2015-04-24 12:29:36 +02:00

system_hooks_service.rb

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

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

test_hook_service.rb

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

2015-05-05 10:18:27 +02:00

update_snippet_service.rb

Enforce restricted visibilities for snippets

2015-03-08 17:57:08 -06:00