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
ac31877d
Commit
ac31877d
authored
Jul 02, 2020
by
Arturo Herrero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow Jira issues without GitLab issues enabled
parent
8dd8e6ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
20 deletions
+6
-20
ee/app/controllers/projects/integrations/jira/issues_controller.rb
...ntrollers/projects/integrations/jira/issues_controller.rb
+0
-1
ee/spec/controllers/projects/integrations/jira/issues_controller_spec.rb
...lers/projects/integrations/jira/issues_controller_spec.rb
+6
-19
No files found.
ee/app/controllers/projects/integrations/jira/issues_controller.rb
View file @
ac31877d
...
@@ -7,7 +7,6 @@ module Projects
...
@@ -7,7 +7,6 @@ module Projects
include
RecordUserLastActivity
include
RecordUserLastActivity
before_action
:check_feature_enabled!
before_action
:check_feature_enabled!
before_action
:check_issues_available!
before_action
do
before_action
do
push_frontend_feature_flag
(
:jira_integration
,
project
)
push_frontend_feature_flag
(
:jira_integration
,
project
)
...
...
ee/spec/controllers/projects/integrations/jira/issues_controller_spec.rb
View file @
ac31877d
...
@@ -16,20 +16,16 @@ RSpec.describe Projects::Integrations::Jira::IssuesController do
...
@@ -16,20 +16,16 @@ RSpec.describe Projects::Integrations::Jira::IssuesController do
create
(
:jira_service
,
project:
project
)
create
(
:jira_service
,
project:
project
)
end
end
context
'when jira_integration feature disabled'
do
it
'renders the "index" template'
do
it
'returns 404 status'
do
get
:index
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
}
stub_feature_flags
(
jira_integration:
false
)
get
:index
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
}
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:index
)
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
end
end
end
context
'when
GitLab issues
disabled'
do
context
'when
jira_integration feature
disabled'
do
it
'returns 404 status'
do
it
'returns 404 status'
do
project
.
issues_enabled
=
false
stub_feature_flags
(
jira_integration:
false
)
project
.
save!
get
:index
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
}
get
:index
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
}
...
@@ -37,15 +33,6 @@ RSpec.describe Projects::Integrations::Jira::IssuesController do
...
@@ -37,15 +33,6 @@ RSpec.describe Projects::Integrations::Jira::IssuesController do
end
end
end
end
context
'when GitLab issues enabled'
do
it
'renders the "index" template'
do
get
:index
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
}
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:index
)
end
end
context
'when project has moved'
do
context
'when project has moved'
do
let
(
:new_project
)
{
create
(
:project
)
}
let
(
:new_project
)
{
create
(
:project
)
}
...
...
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