diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
| commit | ad68bc63b5e7e8080e82d9febec05397c802d33d (patch) | |
| tree | d9508d5bd96c8087d13b88051637bb442e877659 /app/views/projects/runners/_runner.html.haml | |
| parent | 41c06c311b9c5642f6056d0b34030980ebf507b3 (diff) | |
| parent | cc322603945816ed957da7c0efa56e2ef1016569 (diff) | |
| download | gitlab-ce-ad68bc63b5e7e8080e82d9febec05397c802d33d.tar.gz | |
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
# app/models/project.rb
# db/schema.rb
# lib/gitlab/import_export/import_export_reader.rb
Diffstat (limited to 'app/views/projects/runners/_runner.html.haml')
| -rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 47ec420189d..96e2aac451f 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -5,7 +5,7 @@ - if @runners.include?(runner) = link_to runner.short_sha, runner_path(runner) %small - =link_to edit_namespace_project_runner_path(@project.namespace, @project, runner) do + = link_to edit_namespace_project_runner_path(@project.namespace, @project, runner) do %i.fa.fa-edit.btn - else = runner.short_sha |