diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-24 14:45:18 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-24 14:45:18 -0500 |
| commit | 08f1ce90fa5a2806058c0ebec0baac9b158c0dec (patch) | |
| tree | 67e817cfc8c8b5834d109f264e95f9b2e26aa168 | |
| parent | c5f91476459cda8906315e1a90800b01a2ff2e93 (diff) | |
| download | gitlab-ce-08f1ce90fa5a2806058c0ebec0baac9b158c0dec.tar.gz | |
Fix diff notes spec
| -rw-r--r-- | app/assets/javascripts/diff_notes/diff_notes_bundle.js | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 | ||||
| -rw-r--r-- | spec/features/projects/tree/create_directory_spec.rb | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/diff_notes/diff_notes_bundle.js b/app/assets/javascripts/diff_notes/diff_notes_bundle.js index e17daec6a92..d5161ab7df9 100644 --- a/app/assets/javascripts/diff_notes/diff_notes_bundle.js +++ b/app/assets/javascripts/diff_notes/diff_notes_bundle.js @@ -69,9 +69,10 @@ export default () => { gl.diffNotesCompileComponents(); - if (!hasVueMRDiscussionsCookie()) { + const resolveCountAppEl = document.querySelector('#resolve-count-app'); + if (!hasVueMRDiscussionsCookie() && resolveCountAppEl) { new Vue({ - el: '#resolve-count-app', + el: resolveCountAppEl, components: { 'resolve-count': ResolveCount }, diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 1937c250e0b..08a14f0a8a8 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -639,6 +639,10 @@ ul.notes { margin-left: -55px; position: absolute; z-index: 10; + + .new & { + margin-top: -10px; + } } .discussion-body, diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb index b242e41df1c..fb57de141e7 100644 --- a/spec/features/projects/tree/create_directory_spec.rb +++ b/spec/features/projects/tree/create_directory_spec.rb @@ -10,6 +10,8 @@ feature 'Multi-file editor new directory', :js do visit project_tree_path(project, :master) + live_debug + wait_for_requests click_link('Web IDE') |