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
ce54eaed
Commit
ce54eaed
authored
Feb 25, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
a2266aae
b6f37434
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/models/clusters/applications/runner.rb
app/models/clusters/applications/runner.rb
+1
-1
changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-2-0.yml
...s/unreleased/update-gitlab-runner-helm-chart-to-0-2-0.yml
+5
-0
spec/models/clusters/applications/runner_spec.rb
spec/models/clusters/applications/runner_spec.rb
+2
-2
No files found.
app/models/clusters/applications/runner.rb
View file @
ce54eaed
...
...
@@ -3,7 +3,7 @@
module
Clusters
module
Applications
class
Runner
<
ActiveRecord
::
Base
VERSION
=
'0.
1.45
'
.
freeze
VERSION
=
'0.
2.0
'
.
freeze
self
.
table_name
=
'clusters_applications_runners'
...
...
changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-2-0.yml
0 → 100644
View file @
ce54eaed
---
title
:
Update GitLab Runner Helm Chart to 0.2.0
merge_request
:
25493
author
:
type
:
other
spec/models/clusters/applications/runner_spec.rb
View file @
ce54eaed
...
...
@@ -22,7 +22,7 @@ describe Clusters::Applications::Runner do
it
'should be initialized with 4 arguments'
do
expect
(
subject
.
name
).
to
eq
(
'runner'
)
expect
(
subject
.
chart
).
to
eq
(
'runner/gitlab-runner'
)
expect
(
subject
.
version
).
to
eq
(
'0.
1.45
'
)
expect
(
subject
.
version
).
to
eq
(
'0.
2.0
'
)
expect
(
subject
).
to
be_rbac
expect
(
subject
.
repository
).
to
eq
(
'https://charts.gitlab.io'
)
expect
(
subject
.
files
).
to
eq
(
gitlab_runner
.
files
)
...
...
@@ -40,7 +40,7 @@ describe Clusters::Applications::Runner do
let
(
:gitlab_runner
)
{
create
(
:clusters_applications_runner
,
:errored
,
runner:
ci_runner
,
version:
'0.1.13'
)
}
it
'should be initialized with the locked version'
do
expect
(
subject
.
version
).
to
eq
(
'0.
1.45
'
)
expect
(
subject
.
version
).
to
eq
(
'0.
2.0
'
)
end
end
end
...
...
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