diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-28 18:39:01 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 09:43:54 +0000 |
| commit | 7ad626e348faaea6f186759dada36079d531f6fd (patch) | |
| tree | df00ab0450ca635b260c33025dd9867760267ca3 | |
| parent | 9972f59f94ab017d27d9278dd1c9dd89da489e64 (diff) | |
| download | gitlab-ce-7ad626e348faaea6f186759dada36079d531f6fd.tar.gz | |
Use same folder structure in spec for vue shared resources
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_bundle.js.es6 (renamed from app/assets/javascripts/commit/pipelines_bundle.js.es6) | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 (renamed from app/assets/javascripts/commit/pipelines_service.js.es6) | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 (renamed from app/assets/javascripts/commit/pipelines_store.js.es6) | 0 | ||||
| -rw-r--r-- | app/views/projects/commit/pipelines.html.haml | 2 | ||||
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | spec/javascripts/vue_shared/components/commit_spec.js.es6 (renamed from spec/javascripts/vue_common_components/commit_spec.js.es6) | 0 |
6 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/commit/pipelines_bundle.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js.es6 index d2547f0b4a8..d2547f0b4a8 100644 --- a/app/assets/javascripts/commit/pipelines_bundle.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js.es6 diff --git a/app/assets/javascripts/commit/pipelines_service.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 index 7d773e0d361..7d773e0d361 100644 --- a/app/assets/javascripts/commit/pipelines_service.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 diff --git a/app/assets/javascripts/commit/pipelines_store.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 index bc748bece5d..bc748bece5d 100644 --- a/app/assets/javascripts/commit/pipelines_store.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 diff --git a/app/views/projects/commit/pipelines.html.haml b/app/views/projects/commit/pipelines.html.haml index f4937a03f03..09bd4288b9c 100644 --- a/app/views/projects/commit/pipelines.html.haml +++ b/app/views/projects/commit/pipelines.html.haml @@ -4,7 +4,7 @@ = render 'ci_menu' - content_for :page_specific_javascripts do - = page_specific_javascript_tag("commit/pipelines_bundle.js") + = page_specific_javascript_tag("commit/pipelines/pipelines_bundle.js") #commit-pipeline-table-view{ data: { pipelines_data: pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id)}} .pipeline-svgs{ data: { "commit_icon_svg" => custom_icon("icon_commit"), diff --git a/config/application.rb b/config/application.rb index 88c5e27d17d..281a660ddee 100644 --- a/config/application.rb +++ b/config/application.rb @@ -105,7 +105,7 @@ module Gitlab config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js" config.assets.precompile << "boards/test_utils/simulate_drag.js" config.assets.precompile << "environments/environments_bundle.js" - config.assets.precompile << "commit/pipelines_bundle.js" + config.assets.precompile << "commit/pipelines/pipelines_bundle.js" config.assets.precompile << "blob_edit/blob_edit_bundle.js" config.assets.precompile << "snippet/snippet_bundle.js" config.assets.precompile << "terminal/terminal_bundle.js" diff --git a/spec/javascripts/vue_common_components/commit_spec.js.es6 b/spec/javascripts/vue_shared/components/commit_spec.js.es6 index caf84ec63e2..caf84ec63e2 100644 --- a/spec/javascripts/vue_common_components/commit_spec.js.es6 +++ b/spec/javascripts/vue_shared/components/commit_spec.js.es6 |