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
a35bf584
Commit
a35bf584
authored
Dec 31, 2018
by
Peter Leitzen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move tracing setting into a helper
parent
912eb035
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
ee/app/controllers/projects/settings/operations_controller.rb
...pp/controllers/projects/settings/operations_controller.rb
+6
-1
ee/app/views/projects/settings/operations/show.html.haml
ee/app/views/projects/settings/operations/show.html.haml
+4
-3
No files found.
ee/app/controllers/projects/settings/operations_controller.rb
View file @
a35bf584
...
...
@@ -7,7 +7,6 @@ module Projects
before_action
:authorize_update_environment!
def
show
@tracing_settings
||=
ProjectTracingSetting
.
for_project
(
@project
)
end
def
update
...
...
@@ -25,6 +24,12 @@ module Projects
private
helper_method
:tracing_setting
def
tracing_setting
@tracing_setting
||=
project
.
tracing_setting
||
project
.
build_tracing_setting
end
def
render_result
(
result
)
respond_to
do
|
format
|
format
.
html
do
...
...
ee/app/views/projects/settings/operations/show.html.haml
View file @
a35bf584
...
...
@@ -2,7 +2,8 @@
-
page_title
_
(
"Operations Settings"
)
-
page_title
_
(
"Operations"
)
-
has_jaeger_url
=
@project
.
tracing_external_url
.
present?
-
setting
=
tracing_setting
-
has_jaeger_url
=
setting
.
external_url
.
present?
%section
%h4
...
...
@@ -18,8 +19,8 @@
%span
=
_
(
'Tracing'
)
=
_
(
"To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server"
).
html_safe
%
{
link:
tracing_link
}
=
form_for
@tracing_settings
,
as: :tracing_settings
,
url:
project_settings_operations_path
(
@project
)
do
|
f
|
=
form_errors
(
@tracing_settings
)
=
form_for
setting
,
as: :tracing_settings
,
url:
project_settings_operations_path
(
@project
)
do
|
f
|
=
form_errors
(
setting
)
.form-group
=
f
.
label
:external_url
,
_
(
'Jaeger URL'
),
class:
'label-bold'
=
f
.
url_field
:external_url
,
class:
'form-control'
,
placeholder:
'e.g. https://jaeger.mycompany.com'
...
...
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