Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a33a2ba0
Commit
a33a2ba0
authored
Jul 31, 2016
by
Elias Werberich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix confusing description of a blocked user.
parent
a8851a3c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
CHANGELOG
CHANGELOG
+1
-0
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+3
-5
No files found.
CHANGELOG
View file @
a33a2ba0
...
...
@@ -29,6 +29,7 @@ v 8.11.0 (unreleased)
- Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view'. !5368 (Scott Le)
- Load project invited groups and members eagerly in `ProjectTeam#fetch_members`
- Bump gitlab_git to speedup DiffCollection iterations
- Rewrite description of a blocked user in admin settings. (Elias Werberich)
- Make branches sortable without push permission !5462 (winniehell)
- Check for Ci::Build artifacts at database level on pipeline partial
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
...
...
app/views/admin/users/show.html.haml
View file @
a33a2ba0
...
...
@@ -140,12 +140,10 @@
.panel-heading
This user is blocked
.panel-body
%p
Blocking user has the following effects
:
%p
A blocked user cannot
:
%ul
%li
User will not be able to login
%li
User will not be able to access git repositories
%li
Personal projects will be left
%li
Owned groups will be left
%li
Log in
%li
Access Git repositories
%br
=
link_to
'Unblock user'
,
unblock_admin_user_path
(
@user
),
method: :put
,
class:
"btn btn-info"
,
data:
{
confirm:
'Are you sure?'
}
-
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment