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
f5af4efa
Commit
f5af4efa
authored
Sep 10, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix runners page
parent
9d93c567
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
app/mailers/ci/notify.rb
app/mailers/ci/notify.rb
+1
-1
app/views/ci/admin/runners/index.html.haml
app/views/ci/admin/runners/index.html.haml
+2
-1
app/views/ci/runners/_runner.html.haml
app/views/ci/runners/_runner.html.haml
+1
-1
No files found.
app/mailers/ci/notify.rb
View file @
f5af4efa
...
@@ -10,7 +10,7 @@ module Ci
...
@@ -10,7 +10,7 @@ module Ci
default_url_options
[
:port
]
=
Gitlab
.
config
.
gitlab
.
port
unless
Gitlab
.
config
.
gitlab_on_standard_port?
default_url_options
[
:port
]
=
Gitlab
.
config
.
gitlab
.
port
unless
Gitlab
.
config
.
gitlab_on_standard_port?
default_url_options
[
:script_name
]
=
Gitlab
.
config
.
gitlab
.
relative_url_root
default_url_options
[
:script_name
]
=
Gitlab
.
config
.
gitlab
.
relative_url_root
default
from:
Gitlab
Ci
.
config
.
gitlab_ci
.
email_from
default
from:
Gitlab
.
config
.
gitlab
.
email_from
# Just send email with 3 seconds delay
# Just send email with 3 seconds delay
def
self
.
delay
def
self
.
delay
...
...
app/views/ci/admin/runners/index.html.haml
View file @
f5af4efa
...
@@ -47,5 +47,6 @@
...
@@ -47,5 +47,6 @@
%th
Last contact
%th
Last contact
%th
%th
=
render
@runners
-
@runners
.
each
do
|
runner
|
=
render
"ci/admin/runners/runner"
,
runner:
runner
=
paginate
@runners
=
paginate
@runners
app/views/ci/runners/_runner.html.haml
View file @
f5af4efa
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
=
runner_status_icon
(
runner
)
=
runner_status_icon
(
runner
)
%span
.monospace
%span
.monospace
-
if
@runners
.
include?
(
runner
)
-
if
@runners
.
include?
(
runner
)
=
link_to
runner
.
short_sha
,
[
:ci
,
@project
,
runner
]
=
link_to
runner
.
short_sha
,
ci_project_runner_path
(
@project
,
runner
)
%small
%small
=
link_to
edit_ci_project_runner_path
(
@project
,
runner
)
do
=
link_to
edit_ci_project_runner_path
(
@project
,
runner
)
do
%i
.fa.fa-edit.btn
%i
.fa.fa-edit.btn
...
...
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