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
b487a32c
Commit
b487a32c
authored
Jun 02, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review comments
parent
112d540d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/controllers/projects/services_controller.rb
app/controllers/projects/services_controller.rb
+2
-2
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+2
-2
changelogs/unreleased/31511-jira-settings.yml
changelogs/unreleased/31511-jira-settings.yml
+1
-1
spec/features/projects/services/jira_service_spec.rb
spec/features/projects/services/jira_service_spec.rb
+1
-1
No files found.
app/controllers/projects/services_controller.rb
View file @
b487a32c
...
@@ -4,7 +4,7 @@ class Projects::ServicesController < Projects::ApplicationController
...
@@ -4,7 +4,7 @@ class Projects::ServicesController < Projects::ApplicationController
# Authorize
# Authorize
before_action
:authorize_admin_project!
before_action
:authorize_admin_project!
before_action
:service
,
only:
[
:edit
,
:update
,
:test
]
before_action
:service
,
only:
[
:edit
,
:update
,
:test
]
before_action
:
build
_service
,
only:
[
:update
,
:test
]
before_action
:
update
_service
,
only:
[
:update
,
:test
]
respond_to
:html
respond_to
:html
...
@@ -50,7 +50,7 @@ class Projects::ServicesController < Projects::ApplicationController
...
@@ -50,7 +50,7 @@ class Projects::ServicesController < Projects::ApplicationController
end
end
end
end
def
build
_service
def
update
_service
@service
.
assign_attributes
(
service_params
[
:service
])
@service
.
assign_attributes
(
service_params
[
:service
])
end
end
...
...
app/views/projects/services/_form.html.haml
View file @
b487a32c
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%p
=
@service
.
description
%p
=
@service
.
description
.col-lg-9
.col-lg-9
=
form_for
(
@service
,
as: :service
,
url:
namespace_project_service_path
(
@project
.
namespace
,
@project
,
@service
.
to_param
),
method: :put
,
html:
{
class:
'gl-show-field-errors form-horizontal js-integration-settings-form'
,
data:
{
"can-test"
=>
"
#{
@service
.
can_test?
}
"
,
"test-url"
=>
"
#{
test_namespace_project_service_path
(
@project
.
namespace
,
@project
,
@service
)
}
"
}
})
do
|
form
|
=
form_for
(
@service
,
as: :service
,
url:
namespace_project_service_path
(
@project
.
namespace
,
@project
,
@service
.
to_param
),
method: :put
,
html:
{
class:
'gl-show-field-errors form-horizontal js-integration-settings-form'
,
data:
{
'can-test'
=>
@service
.
can_test?
,
'test-url'
=>
test_namespace_project_service_path
}
})
do
|
form
|
=
render
'shared/service_settings'
,
form:
form
,
subject:
@service
=
render
'shared/service_settings'
,
form:
form
,
subject:
@service
.footer-block.row-content-block
.footer-block.row-content-block
%button
.btn.btn-save
{
type:
'submit'
}
%button
.btn.btn-save
{
type:
'submit'
}
...
@@ -22,4 +22,4 @@
...
@@ -22,4 +22,4 @@
-
disabled_class
=
'disabled'
-
disabled_class
=
'disabled'
-
disabled_title
=
@service
.
disabled_title
-
disabled_title
=
@service
.
disabled_title
=
link_to
"Cancel"
,
namespace_project_settings_integrations_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-cancel"
=
link_to
'Cancel'
,
namespace_project_settings_integrations_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-cancel'
changelogs/unreleased/31511-jira-settings.yml
View file @
b487a32c
---
---
title
:
Simplify test
&save actions when setting a service integration
title
:
Simplify test
ing and saving service integrations
merge_request
:
11599
merge_request
:
11599
author
:
author
:
spec/features/projects/services/jira_service_spec.rb
View file @
b487a32c
...
@@ -76,7 +76,7 @@ feature 'Setup Jira service', :feature, :js do
...
@@ -76,7 +76,7 @@ feature 'Setup Jira service', :feature, :js do
end
end
end
end
describe
'user sets Jira Service but keeps it
non active
'
do
describe
'user sets Jira Service but keeps it
disabled
'
do
context
'when Jira connection test succeeds'
do
context
'when Jira connection test succeeds'
do
it
'activates the JIRA service'
do
it
'activates the JIRA service'
do
click_link
(
'JIRA'
)
click_link
(
'JIRA'
)
...
...
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