summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-14 20:55:40 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-14 20:55:40 +0000
commitecb1aea14694ed15010af694a58e8e37be808509 (patch)
treecf5c15a85ba46d61ea949bee357bc5b64906717e
parent5e9a394440f806302a34bb092e3b46d19430dccc (diff)
parentb9f351e8798529f09316c0d8ab77a01c6a18f7bf (diff)
downloadgitlab-ce-ecb1aea14694ed15010af694a58e8e37be808509.tar.gz
Merge branch 'rename-pipeline-to-pipelines' into 'master'
Rename pipeline.js.es6 to pipelines.js.es6 ## What does this MR do? Rename pipeline.js.es6 to pipelines.js.es6 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `class Pipelines` not `class Pipeline` ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6897
-rw-r--r--app/assets/javascripts/pipelines.js.es6 (renamed from app/assets/javascripts/pipeline.js.es6)0
1 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/javascripts/pipeline.js.es6 b/app/assets/javascripts/pipelines.js.es6
index 6bf63ee6979..6bf63ee6979 100644
--- a/app/assets/javascripts/pipeline.js.es6
+++ b/app/assets/javascripts/pipelines.js.es6