Skip to content

G
gitlab-ce
Commit fd872522 authored by Marin Jankovski's avatar Marin Jankovski
Browse files
Options

Merge branch 'master' into group_membership_lock 

Conflicts:
	CHANGELOG-EE
parents 0e9f0a1c c97baeb9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
CHANGELOG-EE
View file @ fd872522
...@@ -3,6 +3,8 @@ v 7.6.0 ...@@ -3,6 +3,8 @@ v 7.6.0
- Added option to attempt a rebase before merging merge request - Added option to attempt a rebase before merging merge request
- Dont show LDAP groups settings if LDAP disabled - Dont show LDAP groups settings if LDAP disabled
- Added member lock for groups to disallow membership additions on project level - 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 v 7.5.3
- Only set up Sidetiq from a Sidekiq server process (fixes Redis::InheritedError) - Only set up Sidetiq from a Sidekiq server process (fixes Redis::InheritedError)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7