summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-11 00:02:16 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-11 00:02:16 +0000
commit6f441ae1a10a00007fcb361626f826321b511d90 (patch)
treed50ea7037c6a71f749a93b820647514274586908
parent0026ec392ebcfc5dbb6fd6efd353b24c337b2109 (diff)
parent0f7cc21e2479762975c4416148105e876c85d8cd (diff)
downloadgitlab-ce-6f441ae1a10a00007fcb361626f826321b511d90.tar.gz
Merge branch '23118-use-one-style-of-naming-js-files' into 'master'
Formatted all app/assets/javascripts to underscore naming convention ## What does this MR do? Changes all javascript file names to user underscores as delimiter. This will be enforced in the docs in a different MR !6782. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Consistency. ## 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? Closes #23118 See merge request !6783
-rw-r--r--app/assets/javascripts/commit/image_file.js (renamed from app/assets/javascripts/commit/image-file.js)0
-rw-r--r--app/assets/javascripts/cycle_analytics.js.es6 (renamed from app/assets/javascripts/cycle-analytics.js.es6)0
-rw-r--r--app/assets/javascripts/issues_bulk_assignment.js.es6 (renamed from app/assets/javascripts/issues-bulk-assignment.js.es6)0
-rw-r--r--app/assets/javascripts/label_manager.js.es6 (renamed from app/assets/javascripts/LabelManager.js.es6)0
-rw-r--r--app/assets/javascripts/network/branch_graph.js (renamed from app/assets/javascripts/network/branch-graph.js)0
5 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/javascripts/commit/image-file.js b/app/assets/javascripts/commit/image_file.js
index e893491b19b..e893491b19b 100644
--- a/app/assets/javascripts/commit/image-file.js
+++ b/app/assets/javascripts/commit/image_file.js
diff --git a/app/assets/javascripts/cycle-analytics.js.es6 b/app/assets/javascripts/cycle_analytics.js.es6
index cd9886ba58d..cd9886ba58d 100644
--- a/app/assets/javascripts/cycle-analytics.js.es6
+++ b/app/assets/javascripts/cycle_analytics.js.es6
diff --git a/app/assets/javascripts/issues-bulk-assignment.js.es6 b/app/assets/javascripts/issues_bulk_assignment.js.es6
index 0808f538f01..0808f538f01 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.es6
+++ b/app/assets/javascripts/issues_bulk_assignment.js.es6
diff --git a/app/assets/javascripts/LabelManager.js.es6 b/app/assets/javascripts/label_manager.js.es6
index bc68e53504f..bc68e53504f 100644
--- a/app/assets/javascripts/LabelManager.js.es6
+++ b/app/assets/javascripts/label_manager.js.es6
diff --git a/app/assets/javascripts/network/branch-graph.js b/app/assets/javascripts/network/branch_graph.js
index 91132af273a..91132af273a 100644
--- a/app/assets/javascripts/network/branch-graph.js
+++ b/app/assets/javascripts/network/branch_graph.js