summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-18 12:43:13 +0000
committerPhil Hughes <me@iamphill.com>2019-03-18 12:43:13 +0000
commit19356faa8164329317a00eb5d225386ab09280c5 (patch)
tree63084ab9d18bf964b4cdfe6ef5cf674d01eea8e1
parent8bc2474553f302d4feb41cb55ffb90c5b72e94c3 (diff)
parent4965f810190e2533889900a54c4fbe93a4aeb4c5 (diff)
downloadgitlab-ce-19356faa8164329317a00eb5d225386ab09280c5.tar.gz
Merge branch '6353-pipelines-index' into 'master'
Removes EE differences for pipelines/index.html Closes gitlab-ee#6353 See merge request gitlab-org/gitlab-ce!26226
-rw-r--r--app/views/projects/pipelines/index.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 6c28cfa31e7..4e4638085fd 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -1,6 +1,8 @@
- @no_container = true
- page_title _('Pipelines')
+= render_if_exists "shared/shared_runners_minutes_limit_flash_message"
+
%div{ 'class' => container_class }
#pipelines-list-vue{ data: { endpoint: project_pipelines_path(@project, format: :json),
"help-page-path" => help_page_path('ci/quick_start/README'),