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
Tatuya Kamada
gitlab-ce
Commits
6b0c0d5b
Commit
6b0c0d5b
authored
Dec 11, 2015
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure that runners registration token is present
parent
917effb7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/ci/admin/runners/index.html.haml
app/views/ci/admin/runners/index.html.haml
+1
-1
lib/ci/api/helpers.rb
lib/ci/api/helpers.rb
+1
-1
spec/features/ci/admin/runners_spec.rb
spec/features/ci/admin/runners_spec.rb
+1
-1
No files found.
app/views/ci/admin/runners/index.html.haml
View file @
6b0c0d5b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
To register a new runner you should enter the following registration token.
To register a new runner you should enter the following registration token.
With this token the runner will request a unique runner token and use that for future communication.
With this token the runner will request a unique runner token and use that for future communication.
Registration token is
Registration token is
%code
{
id:
'runners-token'
}
#{
current_application_settings
.
runners_registration_token
}
%code
{
id:
'runners-token'
}
#{
current_application_settings
.
ensure_
runners_registration_token
}
.bs-callout.clearfix
.bs-callout.clearfix
.pull-left
.pull-left
...
...
lib/ci/api/helpers.rb
View file @
6b0c0d5b
...
@@ -23,7 +23,7 @@ module Ci
...
@@ -23,7 +23,7 @@ module Ci
end
end
def
runner_registration_token_valid?
def
runner_registration_token_valid?
params
[
:token
]
==
current_application_settings
.
runners_registration_token
params
[
:token
]
==
current_application_settings
.
ensure_
runners_registration_token
end
end
def
update_runner_last_contact
def
update_runner_last_contact
...
...
spec/features/ci/admin/runners_spec.rb
View file @
6b0c0d5b
...
@@ -63,7 +63,7 @@ describe "Admin Runners" do
...
@@ -63,7 +63,7 @@ describe "Admin Runners" do
end
end
describe
'runners registration token'
do
describe
'runners registration token'
do
let!
(
:token
)
{
current_application_settings
.
runners_registration_token
}
let!
(
:token
)
{
current_application_settings
.
ensure_
runners_registration_token
}
before
{
visit
ci_admin_runners_path
}
before
{
visit
ci_admin_runners_path
}
it
'has a registration token'
do
it
'has a registration token'
do
...
...
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