Merge branch 'master' into group_membership_lock

Conflicts: CHANGELOG-EE

Merge branch 'master' into group_membership_lock
Conflicts: CHANGELOG-EE
fd872522 · Marin Jankovski · 0e9f0a1c · c97baeb9 · fd872522
Commit fd872522 authored Dec 16, 2014 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CHANGELOG-EE CHANGELOG-EE +2 -0

No files found.
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
@@ -3,6 +3,8 @@ v 7.6.0
  - Added option to attempt a rebase before merging merge request
  - Dont show LDAP groups settings if LDAP disabled
  - Added member lock for groups to disallow membership additions on project level
+  - Rebase on merge request. Introduced merge request option to rebase before merging
+  - Better message for failed pushes because of git hooks

 v 7.5.3
  - Only set up Sidetiq from a Sidekiq server process (fixes Redis::InheritedError)