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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
95eba3aa
Commit
95eba3aa
authored
Sep 19, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve after code-review
parent
9bed20d2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/helpers/auto_devops_helper.rb
app/helpers/auto_devops_helper.rb
+2
-2
app/views/projects/settings/ci_cd/show.html.haml
app/views/projects/settings/ci_cd/show.html.haml
+1
-1
No files found.
app/helpers/auto_devops_helper.rb
View file @
95eba3aa
...
@@ -18,9 +18,9 @@ module AutoDevopsHelper
...
@@ -18,9 +18,9 @@ module AutoDevopsHelper
}
}
if
missing_domain
if
missing_domain
_
(
'Auto Review Apps and Auto Deploy need a domain name and the %
s
to work correctly.'
)
%
params
_
(
'Auto Review Apps and Auto Deploy need a domain name and the %
{kubernetes}
to work correctly.'
)
%
params
else
else
_
(
'Auto Review Apps and Auto Deploy need the %
s
to work correctly.'
)
%
params
_
(
'Auto Review Apps and Auto Deploy need the %
{kubernetes}
to work correctly.'
)
%
params
end
end
elsif
missing_domain
elsif
missing_domain
_
(
'Auto Review Apps and Auto Deploy need a domain name to work correctly.'
)
_
(
'Auto Review Apps and Auto Deploy need a domain name to work correctly.'
)
...
...
app/views/projects/settings/ci_cd/show.html.haml
View file @
95eba3aa
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%button
.btn.js-settings-toggle
%button
.btn.js-settings-toggle
=
expanded
?
'Collapse'
:
'Expand'
=
expanded
?
'Collapse'
:
'Expand'
%p
%p
Update your CI/CD configuration
. You need a CI/CD configuration file or Auto DevOps enabled in order to use pipeline
s.
Update your CI/CD configuration
, like job timeout or Auto DevOp
s.
.settings-content.no-animate
{
class:
(
'expanded'
if
expanded
)
}
.settings-content.no-animate
{
class:
(
'expanded'
if
expanded
)
}
=
render
'projects/pipelines_settings/show'
=
render
'projects/pipelines_settings/show'
...
...
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