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
acaf13d6
Commit
acaf13d6
authored
Jul 20, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an id for the tag(#registration_token). Wrap long lines.
parent
03c72d71
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+3
-1
app/views/ci/runner/_how_to_setup_runner.html.haml
app/views/ci/runner/_how_to_setup_runner.html.haml
+1
-1
app/views/projects/runners/_specific_runners.html.haml
app/views/projects/runners/_specific_runners.html.haml
+3
-1
spec/features/admin/admin_runners_spec.rb
spec/features/admin/admin_runners_spec.rb
+2
-2
No files found.
app/views/admin/runners/index.html.haml
View file @
acaf13d6
...
@@ -35,7 +35,9 @@
...
@@ -35,7 +35,9 @@
method: :put
,
class:
'btn btn-default'
,
method: :put
,
class:
'btn btn-default'
,
data:
{
confirm:
_
(
"Are you sure you want to reset registration token?"
)
}
data:
{
confirm:
_
(
"Are you sure you want to reset registration token?"
)
}
=
render
partial:
'ci/runner/how_to_setup_runner'
,
locals:
{
registration_token:
current_application_settings
.
runners_registration_token
,
type:
'shared'
}
=
render
partial:
'ci/runner/how_to_setup_runner'
,
locals:
{
registration_token:
current_application_settings
.
runners_registration_token
,
type:
'shared'
}
.append-bottom-20.clearfix
.append-bottom-20.clearfix
.pull-left
.pull-left
...
...
app/views/ci/runner/_how_to_setup_runner.html.haml
View file @
acaf13d6
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%li
%li
=
_
(
"Specify the following URL during the Runner setup:"
)
=
_
(
"Specify the following URL during the Runner setup:"
)
%code
=
root_url
(
only_path:
false
)
%code
=
root_url
(
only_path:
false
)
%li
%li
#registration_token
=
_
(
"Use the following registration token during setup:"
)
=
_
(
"Use the following registration token during setup:"
)
%code
=
registration_token
%code
=
registration_token
%li
%li
...
...
app/views/projects/runners/_specific_runners.html.haml
View file @
acaf13d6
%h3
Specific Runners
%h3
Specific Runners
=
render
partial:
'ci/runner/how_to_setup_runner'
,
locals:
{
registration_token:
@project
.
runners_token
,
type:
'specific'
}
=
render
partial:
'ci/runner/how_to_setup_runner'
,
locals:
{
registration_token:
@project
.
runners_token
,
type:
'specific'
}
-
if
@project_runners
.
any?
-
if
@project_runners
.
any?
%h4
.underlined-title
Runners activated for this project
%h4
.underlined-title
Runners activated for this project
...
...
spec/features/admin/admin_runners_spec.rb
View file @
acaf13d6
...
@@ -163,11 +163,11 @@ describe "Admin Runners" do
...
@@ -163,11 +163,11 @@ describe "Admin Runners" do
end
end
it
'has a registration token'
do
it
'has a registration token'
do
expect
(
page
.
find
(
'
.help-callout li:nth-of-type(3)
'
)).
to
have_content
(
token
)
expect
(
page
.
find
(
'
#registration_token
'
)).
to
have_content
(
token
)
end
end
describe
'reload registration token'
do
describe
'reload registration token'
do
let
(
:page_token
)
{
find
(
'
.help-callout li:nth-of-type(3)
code'
).
text
}
let
(
:page_token
)
{
find
(
'
#registration_token
code'
).
text
}
before
do
before
do
click_button
'Reset runners registration token'
click_button
'Reset runners registration token'
...
...
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