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

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

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

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

..

files

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

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

issues

Add a note when an Issue or Merge Request's title changes

2015-05-26 21:49:04 -04:00

merge_requests

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

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

milestones

Merge branch 'group_milestones' into 'master'

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

notes

Add support for Webhook note events

2015-05-21 23:48:16 -04: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-06-05 11:40:36 +02: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

delete_user_service.rb

Skip repo removing whem remove user or group

2015-06-03 16:16:27 +02:00

destroy_group_service.rb

Skip repo removing whem remove user or group

2015-06-03 16:16:27 +02: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-06-05 11:40:36 +02: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

Support editing target branch of merge request

2015-05-29 04:08:08 -07:00

ldap_group_reset_service.rb

Fix EE code after membership refactoring

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

notification_service.rb

Fix.

2015-05-15 13:54:41 +02:00

system_hooks_service.rb

Added X-GitLab-Event header for web hooks

2015-05-08 16:49:03 +03:00

system_note_service.rb

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

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

test_hook_service.rb

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

2015-05-13 14:10:14 +03:00

update_snippet_service.rb

Enforce restricted visibilities for snippets

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