Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- 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

58665b64

Commit 58665b64 authored 8 years ago by Douwe Maan

Downloads
- Plain Diff

Merge branch 'issue_3508' into 'master'

Restrict public users for private instances

Implements #3508

See merge request !3440

parents 70e6fa31 2366768d

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/controllers/users_controller.rb 14 additions, 9 deletions

app/controllers/users_controller.rb
app/models/ability.rb 22 additions, 7 deletions

app/models/ability.rb
app/views/admin/application_settings/_form.html.haml 3 additions, 1 deletion

app/views/admin/application_settings/_form.html.haml
doc/public_access/public_access.md 3 additions, 0 deletions

doc/public_access/public_access.md
lib/api/users.rb 8 additions, 2 deletions

lib/api/users.rb
spec/controllers/groups/group_members_controller_spec.rb 20 additions, 0 deletions

spec/controllers/groups/group_members_controller_spec.rb
spec/controllers/users_controller_spec.rb 24 additions, 1 deletion

spec/controllers/users_controller_spec.rb
spec/requests/api/users_spec.rb 18 additions, 0 deletions

spec/requests/api/users_spec.rb

with 113 additions and 20 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