home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into group_membership_lock

Browse Source 
Conflicts:
	CHANGELOG-EE
This commit is contained in:
Marin Jankovski
2014-12-16 11:38:39 +01:00
parent 0e9f0a1cdd c97baeb9f9
commit fd8725223b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG-EE
+2
View File
@@ -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)