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
489cb00d
Commit
489cb00d
authored
Jul 09, 2020
by
Laura Montemayor
Committed by
Fabio Pitino
Jul 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moves JobsHelper to CI namespace
* Also moves EE
parent
55010526
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
35 deletions
+39
-35
app/helpers/ci/jobs_helper.rb
app/helpers/ci/jobs_helper.rb
+23
-0
app/helpers/jobs_helper.rb
app/helpers/jobs_helper.rb
+0
-19
ee/app/helpers/ee/ci/jobs_helper.rb
ee/app/helpers/ee/ci/jobs_helper.rb
+16
-0
ee/app/helpers/ee/jobs_helper.rb
ee/app/helpers/ee/jobs_helper.rb
+0
-16
No files found.
app/helpers/ci/jobs_helper.rb
0 → 100644
View file @
489cb00d
# frozen_string_literal: true
module
Ci
module
JobsHelper
def
jobs_data
{
"endpoint"
=>
project_job_path
(
@project
,
@build
,
format: :json
),
"project_path"
=>
@project
.
full_path
,
"deployment_help_url"
=>
help_page_path
(
'user/project/clusters/index.html'
,
anchor:
'troubleshooting'
),
"runner_help_url"
=>
help_page_path
(
'ci/runners/README.html'
,
anchor:
'set-maximum-job-timeout-for-a-runner'
),
"runner_settings_url"
=>
project_runners_path
(
@build
.
project
,
anchor:
'js-runners-settings'
),
"variables_settings_url"
=>
project_variables_path
(
@build
.
project
,
anchor:
'js-cicd-variables-settings'
),
"page_path"
=>
project_job_path
(
@project
,
@build
),
"build_status"
=>
@build
.
status
,
"build_stage"
=>
@build
.
stage
,
"log_state"
=>
''
,
"build_options"
=>
javascript_build_options
}
end
end
end
Ci
::
JobsHelper
.
prepend_if_ee
(
'::EE::Ci::JobsHelper'
)
app/helpers/jobs_helper.rb
deleted
100644 → 0
View file @
55010526
# frozen_string_literal: true
module
JobsHelper
def
jobs_data
{
"endpoint"
=>
project_job_path
(
@project
,
@build
,
format: :json
),
"project_path"
=>
@project
.
full_path
,
"deployment_help_url"
=>
help_page_path
(
'user/project/clusters/index.md'
,
anchor:
'troubleshooting'
),
"runner_help_url"
=>
help_page_path
(
'ci/runners/README.md'
,
anchor:
'set-maximum-job-timeout-for-a-runner'
),
"runner_settings_url"
=>
project_runners_path
(
@build
.
project
,
anchor:
'js-runners-settings'
),
"variables_settings_url"
=>
project_variables_path
(
@build
.
project
,
anchor:
'js-cicd-variables-settings'
),
"page_path"
=>
project_job_path
(
@project
,
@build
),
"build_status"
=>
@build
.
status
,
"build_stage"
=>
@build
.
stage
,
"log_state"
=>
''
,
"build_options"
=>
javascript_build_options
}
end
end
ee/app/helpers/ee/ci/jobs_helper.rb
0 → 100644
View file @
489cb00d
# frozen_string_literal: true
module
EE
module
Ci
module
JobsHelper
extend
::
Gitlab
::
Utils
::
Override
override
:jobs_data
def
jobs_data
super
.
merge
({
"subscriptions_more_minutes_url"
=>
::
EE
::
SUBSCRIPTIONS_MORE_MINUTES_URL
})
end
end
end
end
ee/app/helpers/ee/jobs_helper.rb
deleted
100644 → 0
View file @
55010526
# frozen_string_literal: true
module
EE
module
JobsHelper
extend
::
Gitlab
::
Utils
::
Override
override
:jobs_data
def
jobs_data
super
.
merge
({
"subscriptions_more_minutes_url"
=>
::
EE
::
SUBSCRIPTIONS_MORE_MINUTES_URL
})
end
end
end
::
JobsHelper
.
prepend_if_ee
(
'::EE::JobsHelper'
)
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