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

..

abuse_reports

Make tables full width.

2015-10-19 11:19:45 +02:00

appearances

Show "Remove logo" buttons only when Appearance settings are persisted

2015-05-30 18:23:24 -04:00

application_settings

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

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

applications

Make tables full width.

2015-10-19 11:19:45 +02:00

background_jobs

Make tables full width.

2015-10-19 11:19:45 +02:00

broadcast_messages

Fix broadcast message colors to one displayed in preview

2015-06-08 20:39:02 +02:00

dashboard

Rename reply_by_email to incoming_email to prepare for the future.

2015-09-21 10:35:37 +02:00

deploy_keys

Make tables full width.

2015-10-19 11:19:45 +02:00

emails

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

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

git_hooks

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

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

groups

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

2015-07-31 16:12:46 +02:00

hooks

Enable SSL verification for Webhooks

2015-08-26 15:48:31 +03:00

identities

Make tables full width.

2015-10-19 11:19:45 +02:00

keys

Add a page title to every page.

2015-04-30 19:12:15 +02:00

labels

Replace CoffeeScript block into JavaScript in Views.

2015-11-10 19:17:37 +08:00

licenses

Rename issued_at to starts_at.

2015-05-21 19:50:57 +02:00

logs

Add a page title to every page.

2015-04-30 19:12:15 +02:00

projects

Show label on archived projects

2015-08-19 13:47:03 +02:00

services

Make tables full width.

2015-10-19 11:19:45 +02:00

users

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

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