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

3e738e3b

Commit 3e738e3b authored 9 years ago by Stan Hu

Downloads
- Patches
- Plain Diff

Add support for unlocking users in admin settings

Closes https://github.com/gitlabhq/gitlabhq/issues/9381

parent 2ca7ffd0

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/controllers/admin/users_controller.rb 8 additions, 0 deletions

app/controllers/admin/users_controller.rb
app/views/admin/users/index.html.haml 2 additions, 0 deletions

app/views/admin/users/index.html.haml
app/views/admin/users/show.html.haml 8 additions, 0 deletions

app/views/admin/users/show.html.haml
config/routes.rb 1 addition, 0 deletions

config/routes.rb
spec/controllers/admin/users_controller_spec.rb 15 additions, 0 deletions

spec/controllers/admin/users_controller_spec.rb

with 35 additions and 0 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