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

9745c98b

Commit 9745c98b authored 8 years ago by Robert Speicher

Downloads
- Plain Diff

Merge branch 'rs-warden-blocked-users' into 'master'

Don't perform Devise trackable updates on blocked User records

Closes #27519

See merge request !8915

parents b5e10e71 191bcb4d

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/application_controller.rb 1 addition, 16 deletions

app/controllers/application_controller.rb
app/controllers/explore/application_controller.rb 1 addition, 1 deletion

app/controllers/explore/application_controller.rb
app/controllers/help_controller.rb 1 addition, 1 deletion

app/controllers/help_controller.rb
app/controllers/koding_controller.rb 1 addition, 1 deletion

app/controllers/koding_controller.rb
app/controllers/projects/uploads_controller.rb 2 additions, 2 deletions

app/controllers/projects/uploads_controller.rb
app/controllers/search_controller.rb 1 addition, 1 deletion

app/controllers/search_controller.rb
app/models/user.rb 9 additions, 0 deletions

app/models/user.rb
changelogs/unreleased/rs-warden-blocked-users.yml 4 additions, 0 deletions

changelogs/unreleased/rs-warden-blocked-users.yml
spec/controllers/projects/uploads_controller_spec.rb 10 additions, 54 deletions

spec/controllers/projects/uploads_controller_spec.rb
spec/factories/users.rb 8 additions, 0 deletions

spec/factories/users.rb
spec/features/login_spec.rb 16 additions, 0 deletions

spec/features/login_spec.rb

with 54 additions and 76 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