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
1c834292
Commit
1c834292
authored
Aug 24, 2020
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix backend specs
parent
3559083d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
ee/app/helpers/ee/services_helper.rb
ee/app/helpers/ee/services_helper.rb
+1
-1
ee/spec/helpers/ee/services_helper_spec.rb
ee/spec/helpers/ee/services_helper_spec.rb
+4
-0
No files found.
ee/app/helpers/ee/services_helper.rb
View file @
1c834292
...
@@ -18,7 +18,7 @@ module EE
...
@@ -18,7 +18,7 @@ module EE
show_jira_issues_integration:
@project
&
.
feature_available?
(
:jira_issues_integration
).
to_s
,
show_jira_issues_integration:
@project
&
.
feature_available?
(
:jira_issues_integration
).
to_s
,
enable_jira_issues:
integration
.
issues_enabled
.
to_s
,
enable_jira_issues:
integration
.
issues_enabled
.
to_s
,
project_key:
integration
.
project_key
,
project_key:
integration
.
project_key
,
gitlab_issues_enabled:
@project
.
issues_enabled?
.
to_s
,
gitlab_issues_enabled:
@project
&
.
issues_enabled?
.
to_s
,
upgrade_plan_path:
@project
&&
::
Gitlab
::
CurrentSettings
.
should_check_namespace_plan?
?
upgrade_plan_path
(
@project
.
group
)
:
nil
,
upgrade_plan_path:
@project
&&
::
Gitlab
::
CurrentSettings
.
should_check_namespace_plan?
?
upgrade_plan_path
(
@project
.
group
)
:
nil
,
edit_project_path:
@project
?
edit_project_path
(
@project
,
anchor:
'js-shared-permissions'
)
:
nil
edit_project_path:
@project
?
edit_project_path
(
@project
,
anchor:
'js-shared-permissions'
)
:
nil
)
)
...
...
ee/spec/helpers/ee/services_helper_spec.rb
View file @
1c834292
...
@@ -20,6 +20,10 @@ RSpec.describe EE::ServicesHelper do
...
@@ -20,6 +20,10 @@ RSpec.describe EE::ServicesHelper do
describe
'#integration_form_data'
do
describe
'#integration_form_data'
do
subject
{
helper
.
integration_form_data
(
integration
)
}
subject
{
helper
.
integration_form_data
(
integration
)
}
before
do
assign
(
:project
,
project
)
end
context
'Slack service'
do
context
'Slack service'
do
let
(
:integration
)
{
build
(
:slack_service
)
}
let
(
:integration
)
{
build
(
:slack_service
)
}
...
...
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