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
Boxiang Sun
gitlab-ce
Commits
d0a25eb0
Commit
d0a25eb0
authored
May 22, 2017
by
Kushal Pandya
Committed by
Phil Hughes
May 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show password field mask while editing service settings
parent
2079253f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
app/views/shared/_field.html.haml
app/views/shared/_field.html.haml
+2
-2
changelogs/unreleased/31510-mask-password-field-edit.yml
changelogs/unreleased/31510-mask-password-field-edit.yml
+4
-0
features/steps/project/services.rb
features/steps/project/services.rb
+1
-1
No files found.
app/views/shared/_field.html.haml
View file @
d0a25eb0
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
.form-group
.form-group
-
if
type
==
"password"
&&
value
.
present?
-
if
type
==
"password"
&&
value
.
present?
=
form
.
label
name
,
"
Change
#{
titl
e
}
"
,
class:
"control-label"
=
form
.
label
name
,
"
Enter new
#{
title
.
downcas
e
}
"
,
class:
"control-label"
-
else
-
else
=
form
.
label
name
,
title
,
class:
"control-label"
=
form
.
label
name
,
title
,
class:
"control-label"
.col-sm-10
.col-sm-10
...
@@ -22,6 +22,6 @@
...
@@ -22,6 +22,6 @@
-
elsif
type
==
'select'
-
elsif
type
==
'select'
=
form
.
select
name
,
options_for_select
(
choices
,
value
?
value
:
default_choice
),
{},
{
class:
"form-control"
}
=
form
.
select
name
,
options_for_select
(
choices
,
value
?
value
:
default_choice
),
{},
{
class:
"form-control"
}
-
elsif
type
==
'password'
-
elsif
type
==
'password'
=
form
.
password_field
name
,
autocomplete:
"new-password"
,
class:
'form-control'
=
form
.
password_field
name
,
autocomplete:
"new-password"
,
class:
"form-control"
-
if
help
-
if
help
%span
.help-block
=
help
%span
.help-block
=
help
changelogs/unreleased/31510-mask-password-field-edit.yml
0 → 100644
View file @
d0a25eb0
---
title
:
Update password field label while editing service settings
merge_request
:
11431
author
:
features/steps/project/services.rb
View file @
d0a25eb0
...
@@ -211,7 +211,7 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
...
@@ -211,7 +211,7 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
end
end
step
'I should see empty field Change Password'
do
step
'I should see empty field Change Password'
do
expect
(
find_field
(
'
Change P
assword'
).
value
).
to
be_nil
expect
(
find_field
(
'
Enter new p
assword'
).
value
).
to
be_nil
end
end
step
'I click JetBrains TeamCity CI service link'
do
step
'I click JetBrains TeamCity CI service link'
do
...
...
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