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
c8913720
Commit
c8913720
authored
Nov 17, 2020
by
Alan Paruszewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix saving Jira Configuration for Group
parent
1e6580e9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
ee/app/models/project_services/ee/jira_service.rb
ee/app/models/project_services/ee/jira_service.rb
+1
-1
ee/changelogs/unreleased/284181-fix-saving-jira-configuration-when-is-not-configured-for-projec.yml
...-jira-configuration-when-is-not-configured-for-projec.yml
+5
-0
ee/spec/models/project_services/jira_service_spec.rb
ee/spec/models/project_services/jira_service_spec.rb
+6
-0
No files found.
ee/app/models/project_services/ee/jira_service.rb
View file @
c8913720
...
@@ -12,7 +12,7 @@ module EE
...
@@ -12,7 +12,7 @@ module EE
end
end
def
jira_vulnerabilities_integration_enabled?
def
jira_vulnerabilities_integration_enabled?
project
.
jira_vulnerabilities_integration_available?
&&
vulnerabilities_enabled
project
&
.
jira_vulnerabilities_integration_available?
&&
vulnerabilities_enabled
end
end
def
project_key_required?
def
project_key_required?
...
...
ee/changelogs/unreleased/284181-fix-saving-jira-configuration-when-is-not-configured-for-projec.yml
0 → 100644
View file @
c8913720
---
title
:
Fix Group Jira Integration configuration page
merge_request
:
47944
author
:
type
:
fixed
ee/spec/models/project_services/jira_service_spec.rb
View file @
c8913720
...
@@ -40,6 +40,12 @@ RSpec.describe JiraService do
...
@@ -40,6 +40,12 @@ RSpec.describe JiraService do
describe
'jira_vulnerabilities_integration_enabled?'
do
describe
'jira_vulnerabilities_integration_enabled?'
do
subject
(
:jira_vulnerabilities_integration_enabled
)
{
jira_service
.
jira_vulnerabilities_integration_enabled?
}
subject
(
:jira_vulnerabilities_integration_enabled
)
{
jira_service
.
jira_vulnerabilities_integration_enabled?
}
context
'when integration is not configured for the project'
do
let
(
:options
)
{
{
project:
nil
}
}
it
{
is_expected
.
to
be_falsey
}
end
context
'when jira integration is not available for the project'
do
context
'when jira integration is not available for the project'
do
before
do
before
do
allow
(
jira_service
.
project
).
to
receive
(
:jira_vulnerabilities_integration_available?
).
and_return
(
false
)
allow
(
jira_service
.
project
).
to
receive
(
:jira_vulnerabilities_integration_available?
).
and_return
(
false
)
...
...
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