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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
731b8609
Commit
731b8609
authored
Oct 01, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide password in the service settings form
parent
2fa89a3d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
3 deletions
+14
-3
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/services_controller.rb
app/controllers/projects/services_controller.rb
+3
-1
app/views/shared/_field.html.haml
app/views/shared/_field.html.haml
+5
-2
features/project/service.feature
features/project/service.feature
+1
-0
features/steps/project/services.rb
features/steps/project/services.rb
+4
-0
No files found.
CHANGELOG
View file @
731b8609
...
@@ -26,6 +26,7 @@ v 8.1.0 (unreleased)
...
@@ -26,6 +26,7 @@ v 8.1.0 (unreleased)
- Show additions/deletions stats on merge request diff
- Show additions/deletions stats on merge request diff
- Remove footer text in emails (Zeger-Jan van de Weg)
- Remove footer text in emails (Zeger-Jan van de Weg)
- Ensure code blocks are properly highlighted after a note is updated
- Ensure code blocks are properly highlighted after a note is updated
- Hide password in the service settings form
v 8.0.3
v 8.0.3
- Fix URL shown in Slack notifications
- Fix URL shown in Slack notifications
...
...
app/controllers/projects/services_controller.rb
View file @
731b8609
...
@@ -58,6 +58,8 @@ class Projects::ServicesController < Projects::ApplicationController
...
@@ -58,6 +58,8 @@ class Projects::ServicesController < Projects::ApplicationController
end
end
def
service_params
def
service_params
params
.
require
(
:service
).
permit
(
ALLOWED_PARAMS
)
service_params
=
params
.
require
(
:service
).
permit
(
ALLOWED_PARAMS
)
service_params
.
delete
(
"password"
)
if
service_params
[
"password"
].
blank?
service_params
end
end
end
end
app/views/shared/_field.html.haml
View file @
731b8609
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
-
help
=
field
[
:help
]
-
help
=
field
[
:help
]
.form-group
.form-group
-
if
type
==
"password"
&&
value
.
present?
=
form
.
label
name
,
"Change
#{
title
}
"
,
class:
"control-label"
-
else
=
form
.
label
name
,
title
,
class:
"control-label"
=
form
.
label
name
,
title
,
class:
"control-label"
.col-sm-10
.col-sm-10
-
if
type
==
'text'
-
if
type
==
'text'
...
@@ -19,6 +22,6 @@
...
@@ -19,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
,
value:
value
,
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
features/project/service.feature
View file @
731b8609
...
@@ -72,6 +72,7 @@ Feature: Project Services
...
@@ -72,6 +72,7 @@ Feature: Project Services
And
I click Atlassian Bamboo CI service link
And
I click Atlassian Bamboo CI service link
And
I fill Atlassian Bamboo CI settings
And
I fill Atlassian Bamboo CI settings
Then
I should see Atlassian Bamboo CI service settings saved
Then
I should see Atlassian Bamboo CI service settings saved
And
I should see empty field Change Password
Scenario
:
Activate jetBrains TeamCity CI service
Scenario
:
Activate jetBrains TeamCity CI service
When
I visit project
"Shop"
services page
When
I visit project
"Shop"
services page
...
...
features/steps/project/services.rb
View file @
731b8609
...
@@ -202,6 +202,10 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
...
@@ -202,6 +202,10 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
expect
(
find_field
(
'Username'
).
value
).
to
eq
'user'
expect
(
find_field
(
'Username'
).
value
).
to
eq
'user'
end
end
step
'I should see empty field Change Password'
do
expect
(
find_field
(
'Change Password'
).
value
).
to
be_nil
end
step
'I click JetBrains TeamCity CI service link'
do
step
'I click JetBrains TeamCity CI service link'
do
click_link
'JetBrains TeamCity CI'
click_link
'JetBrains TeamCity CI'
end
end
...
...
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