summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-01-06 09:23:32 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-02-06 14:51:18 -0600
commit08ecab601398b9c62fb4b6c6231f610e5636f977 (patch)
treee19d5f474ba9186e7ffdc7584ecdb926edde02c9 /app/views
parent58110293d4425c50a87975749551e069a02dc0cd (diff)
downloadgitlab-ce-08ecab601398b9c62fb4b6c6231f610e5636f977.tar.gz
changed pipelines controller name to ci_cd_pipelines
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/runners/_shared_runners.html.haml2
-rw-r--r--app/views/projects/settings/ci_cd_pipelines/show.html.haml (renamed from app/views/projects/settings/pipelines/show.html.haml)0
2 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml
index 5afa193357e..0671dd66e78 100644
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
@@ -22,7 +22,7 @@
- else
%h4.underlined-title Available shared Runners : #{@shared_runners_count}
%ul.bordered-list.available-shared-runners
- = render partial: 'runner', collection: @shared_runners, as: :runner
+ = render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner
- if @shared_runners_count > 10
.light
and #{@shared_runners_count - 10} more...
diff --git a/app/views/projects/settings/pipelines/show.html.haml b/app/views/projects/settings/ci_cd_pipelines/show.html.haml
index 09598cd8203..09598cd8203 100644
--- a/app/views/projects/settings/pipelines/show.html.haml
+++ b/app/views/projects/settings/ci_cd_pipelines/show.html.haml