diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-12 17:44:41 +0000 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-14 11:50:22 +0000 |
| commit | 8e93617ed5e9b89c62fef53c8fa664f3bc034866 (patch) | |
| tree | e4088c9bab4c92b585fcf50c5204bb5dd3f40b6c | |
| parent | be0785ed81fdde5d88db07f992adaa9326e2dd9c (diff) | |
| download | gitlab-ce-8e93617ed5e9b89c62fef53c8fa664f3bc034866.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) |