Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

8e01b836

Commit 8e01b836 authored 9 years ago by Robert Speicher

Downloads
- Plain Diff

Merge branch 'ldap-sync-notifications' into 'master'

Don't send "Added to group" notifications when group is LDAP synched

Addresses gitlab/gitlab-ee#313.

See merge request !463

parents 099d40f5 1afb0faa

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG-EE 4 additions, 1 deletion

CHANGELOG-EE
app/models/group.rb 6 additions, 6 deletions

app/models/group.rb
app/models/member.rb 4 additions, 1 deletion

app/models/member.rb
app/models/members/group_member.rb 5 additions, 5 deletions

app/models/members/group_member.rb
app/models/members/project_member.rb 5 additions, 5 deletions

app/models/members/project_member.rb
lib/gitlab/ldap/access.rb 1 addition, 1 deletion

lib/gitlab/ldap/access.rb
spec/lib/gitlab/ldap/access_spec.rb 15 additions, 0 deletions

spec/lib/gitlab/ldap/access_spec.rb

with 40 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment