Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee ...

Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb

2015-11-19 10:33:18 -05:00

..

ci

Fix CI badge

2015-10-26 12:23:40 +01:00

files

Merge remote-tracking branch 'origin/master' into ce_upsteram

2015-11-05 14:26:35 +02:00

issues

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-13 12:34:34 -05:00

merge_requests

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-13 12:34:34 -05:00

milestones

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

notes

Use issue editor as cross reference comment author when issue is edited with a new mention.

2015-10-28 13:09:51 +01:00

oauth2

Rubocop: no trailing newlines

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

projects

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

search

An in_namespace scope is already present

2015-06-09 13:42:01 +02:00

archive_repository_service.rb

Clear archive cache asynchronously

2015-10-20 16:53:37 +02:00

audit_event_service.rb

Fix audit_event_service after CE merge

2015-07-14 16:27:13 +02:00

base_service.rb

Merge master from CE

2015-08-17 14:01:32 +02:00

compare_service.rb

Add ignore white space option in merge request diff

2015-11-13 16:53:53 +09: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

Refactor release code a bit

2015-11-09 15:30:50 +01: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

Refactor release code a bit

2015-11-09 15:30:50 +01:00

delete_user_service.rb

Fix error when deleting a user who has projects

2015-06-23 04:39:49 -07: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

Create a "destroyed Milestone" event and keep Milestone events around in the DB

2015-09-15 05:51:11 -07:00

git_push_service.rb

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-15 00:30:17 -05:00

git_tag_push_service.rb

Build missing cache items in background job after each push

2015-07-17 14:50:03 +02:00

gravatar_service.rb

Improve application settings and write tests

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

issuable_base_service.rb

Dynamically check :admin_* ability in IssuableBaseService

2015-07-24 15:50:12 -04:00

ldap_group_reset_service.rb

satisfy rubocop

2015-10-15 19:15:58 +03:00

notification_service.rb

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

system_hooks_service.rb

Split complex method SystemHooksService#build_event_data

2015-11-13 00:12:18 +01:00

system_note_service.rb

Merge remote-tracking branch 'origin/master' into ce_upstream

2015-10-23 13:01:19 +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

Change dynamic abilities to new format

2015-06-26 17:18:40 +02:00