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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
860fa116
Commit
860fa116
authored
Jul 20, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1117 from patthoyts/pt/user-form
Fix english on the edit user form.
parents
9267cb04
787e5e94
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+3
-3
No files found.
app/views/admin/users/_form.html.haml
View file @
860fa116
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
.alert
.alert
.clearfix
.clearfix
%p
Give user ability to manage application
.
%p
Make the user a GitLab administrator
.
=
f
.
label
:admin
,
:class
=>
"checkbox"
do
=
f
.
label
:admin
,
:class
=>
"checkbox"
do
=
f
.
check_box
:admin
=
f
.
check_box
:admin
%span
Administrator
%span
Administrator
...
@@ -59,11 +59,11 @@
...
@@ -59,11 +59,11 @@
-
if
@admin_user
.
blocked
-
if
@admin_user
.
blocked
%span
%span
=
link_to
'Unblock'
,
unblock_admin_user_path
(
@admin_user
),
:method
=>
:put
,
:class
=>
"btn small"
=
link_to
'Unblock'
,
unblock_admin_user_path
(
@admin_user
),
:method
=>
:put
,
:class
=>
"btn small"
This user is blocked and is not able to login GitLab
This user is blocked and is not able to login
to
GitLab
-
else
-
else
%span
%span
=
link_to
'Block'
,
block_admin_user_path
(
@admin_user
),
:confirm
=>
'USER WILL BE BLOCKED! Are you sure?'
,
:method
=>
:put
,
:class
=>
"btn small danger"
=
link_to
'Block'
,
block_admin_user_path
(
@admin_user
),
:confirm
=>
'USER WILL BE BLOCKED! Are you sure?'
,
:method
=>
:put
,
:class
=>
"btn small danger"
Blocked user
will
removed from all projects
&
will not be able to login to GitLab.
Blocked user
s will be
removed from all projects
&
will not be able to login to GitLab.
.actions
.actions
=
f
.
submit
'Save'
,
:class
=>
"btn primary"
=
f
.
submit
'Save'
,
:class
=>
"btn primary"
-
if
@admin_user
.
new_record?
-
if
@admin_user
.
new_record?
...
...
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