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

..

deploy

Fix typo

2015-03-14 10:22:06 +01:00

init.d

Switch to gitlab-workhorse

2015-10-29 14:21:24 +01:00

logrotate

Logrotate daily, keeping 90 days of old logs

2014-03-12 15:26:39 +01:00

nginx

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

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