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
9bacc3d0
Commit
9bacc3d0
authored
Jun 18, 2020
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve redundant rubocop issues
- clean codebase as a followup from disabling.
parent
520ac5e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
17 deletions
+8
-17
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+4
-16
app/views/shared/_field.html.haml
app/views/shared/_field.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/views/admin/users/show.html.haml
View file @
9bacc3d0
...
...
@@ -86,34 +86,22 @@
%li
%span
.light
Current sign-in IP:
%strong
-
if
@user
.
current_sign_in_ip
# rubocop:disable Style/RedundantCondition
=
@user
.
current_sign_in_ip
-
else
never
=
@user
.
current_sign_in_ip
||
_
(
'never'
)
%li
%span
.light
Current sign-in at:
%strong
-
if
@user
.
current_sign_in_at
=
@user
.
current_sign_in_at
.
to_s
(
:medium
)
-
else
never
=
@user
.
current_sign_in_at
&
.
to_s
(
:medium
)
||
_
(
'never'
)
%li
%span
.light
Last sign-in IP:
%strong
-
if
@user
.
last_sign_in_ip
# rubocop:disable Style/RedundantCondition
=
@user
.
last_sign_in_ip
-
else
never
=
@user
.
last_sign_in_ip
||
_
(
'never'
)
%li
%span
.light
Last sign-in at:
%strong
-
if
@user
.
last_sign_in_at
=
@user
.
last_sign_in_at
.
to_s
(
:medium
)
-
else
never
=
@user
.
last_sign_in_at
&
.
to_s
(
:medium
)
||
_
(
'never'
)
%li
%span
.light
Sign-in count:
...
...
app/views/shared/_field.html.haml
View file @
9bacc3d0
...
...
@@ -22,7 +22,7 @@
-
elsif
type
==
'checkbox'
=
form
.
check_box
name
-
elsif
type
==
'select'
=
form
.
select
name
,
options_for_select
(
choices
,
value
?
value
:
default_choice
),
{},
{
class:
"form-control"
}
# rubocop:disable Style/RedundantCondition
=
form
.
select
name
,
options_for_select
(
choices
,
value
||
default_choice
),
{},
{
class:
"form-control"
}
-
elsif
type
==
'password'
=
form
.
password_field
name
,
autocomplete:
"new-password"
,
placeholder:
placeholder
,
class:
"form-control"
,
required:
value
.
blank?
&&
required
,
data:
{
qa_selector:
"
#{
name
.
downcase
.
gsub
(
'\s'
,
''
)
}
_field"
}
-
if
help
...
...
locale/gitlab.pot
View file @
9bacc3d0
...
...
@@ -27428,6 +27428,9 @@ msgstr ""
msgid "needs to be between 10 minutes and 1 month"
msgstr ""
msgid "never"
msgstr ""
msgid "never expires"
msgstr ""
...
...
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