diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-12 17:44:41 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-12 17:44:41 +0000 |
| commit | bbfec704f7ed964807f2c14cac51ef8d0f9ff417 (patch) | |
| tree | 7f6b3edaff40e67eff2594cb4915020f087916a8 | |
| parent | 94e53df015c01851599396072e72330f6289f36b (diff) | |
| parent | 265da7ddcbd19172518ed523ecbbb171bfcbeeb5 (diff) | |
| download | gitlab-ce-bbfec704f7ed964807f2c14cac51ef8d0f9ff417.tar.gz | |
Merge branch 'jivl-fix-missing-js-selector-realtime-pipeline' into 'master'
Fixed missing js selector for the realtime pipelines commit component
See merge request gitlab-org/gitlab-ce!17061
| -rw-r--r-- | app/assets/javascripts/pages/projects/tree/show/index.js | 2 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/projects/tree/show/index.js b/app/assets/javascripts/pages/projects/tree/show/index.js index c4b3356e478..cba57058380 100644 --- a/app/assets/javascripts/pages/projects/tree/show/index.js +++ b/app/assets/javascripts/pages/projects/tree/show/index.js @@ -14,7 +14,7 @@ export default () => { $('#tree-slider').waitForImages(() => ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath)); - const commitPipelineStatusEl = document.getElementById('commit-pipeline-status'); + const commitPipelineStatusEl = document.querySelector('.js-commit-pipeline-status'); const statusLink = document.querySelector('.commit-actions .ci-status-link'); if (statusLink != null) { statusLink.remove(); diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 64259669c19..6ff7bcae54f 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -51,7 +51,7 @@ - if commit.status(ref) = render_commit_status(commit, ref: ref) - #commit-pipeline-status{ data: { endpoint: pipelines_project_commit_path(project, commit.id) } } + .js-commit-pipeline-status{ data: { endpoint: pipelines_project_commit_path(project, commit.id) } } = link_to commit.short_id, link, class: "commit-sha btn btn-transparent btn-link" = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard")) = link_to_browse_code(project, commit) |