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_report_mailer

Add HTML abuse report notification email.

2015-10-18 11:58:24 +02:00

abuse_reports

Improve abuse report wording

2015-08-08 19:46:34 +02:00

admin

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

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

audit_events

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

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

ci

Merge branch 'ci-build-name-in-notification-email' into 'master'

2015-11-10 22:04:08 +00:00

dashboard

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

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

devise

Merge branch 'master' into ce-to-ee

2015-11-16 10:12:23 +02:00

doorkeeper

Make tables full width.

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

email_rejection_mailer

We'll get the <p> for free.

2015-08-19 12:38:08 -07:00

errors

Add a page title to every page.

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

events

Merge branch 'master' into rs-redactor-filter

2015-10-07 15:15:35 +02:00

explore

Update style of snippets pages

2015-10-18 13:03:26 +02:00

groups

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

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

help

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

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

import

Replace CoffeeScript block into JavaScript in Views.

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

invites

Add a page title to every page.

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

kaminari/gitlab

Add links to first and/or last page with kaminari

2015-09-23 22:15:16 +02:00

layouts

Merge branch 'mirror-repository' into 'master'

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

ldap_group_links

Improve UI for sharing project with groups and LDAP groups pages

2015-03-18 19:49:24 -07:00

notify

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

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

profiles

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

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

projects

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

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

search

Fix code that depends on incorrect inflector behavior

2015-11-03 12:00:27 +01:00

shared

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

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

sherlock

Truncate transaction paths to 70 characters

2015-11-09 14:29:10 +01:00

snippets

Put delete snippet btn after edit btn

2015-10-29 10:25:38 +01:00

unsubscribes

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

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

users

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

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

votes

Fix votes inline rendering

2015-03-20 15:34:29 -07:00