kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fix runners page

Browse source
This commit is contained in:
Valery Sizov 2015-09-10 17:05:43 +03:00
parent 9d93c567b3
commit f5af4efabd
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/ci/notify.rb
View file

@ -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: GitlabCi.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

3
app/views/ci/admin/runners/index.html.haml
View file

@ -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

2
app/views/ci/runners/_runner.html.haml
View file

@ -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