Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
08f1ce90
Commit
08f1ce90
authored
Apr 24, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix diff notes spec
parent
c5f91476
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/diff_notes/diff_notes_bundle.js
app/assets/javascripts/diff_notes/diff_notes_bundle.js
+3
-2
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+4
-0
spec/features/projects/tree/create_directory_spec.rb
spec/features/projects/tree/create_directory_spec.rb
+2
-0
No files found.
app/assets/javascripts/diff_notes/diff_notes_bundle.js
View file @
08f1ce90
...
@@ -69,9 +69,10 @@ export default () => {
...
@@ -69,9 +69,10 @@ export default () => {
gl
.
diffNotesCompileComponents
();
gl
.
diffNotesCompileComponents
();
if
(
!
hasVueMRDiscussionsCookie
())
{
const
resolveCountAppEl
=
document
.
querySelector
(
'
#resolve-count-app
'
);
if
(
!
hasVueMRDiscussionsCookie
()
&&
resolveCountAppEl
)
{
new
Vue
({
new
Vue
({
el
:
'
#resolve-count-app
'
,
el
:
resolveCountAppEl
,
components
:
{
components
:
{
'
resolve-count
'
:
ResolveCount
'
resolve-count
'
:
ResolveCount
},
},
...
...
app/assets/stylesheets/pages/notes.scss
View file @
08f1ce90
...
@@ -639,6 +639,10 @@ ul.notes {
...
@@ -639,6 +639,10 @@ ul.notes {
margin-left
:
-55px
;
margin-left
:
-55px
;
position
:
absolute
;
position
:
absolute
;
z-index
:
10
;
z-index
:
10
;
.new
&
{
margin-top
:
-10px
;
}
}
}
.discussion-body
,
.discussion-body
,
...
...
spec/features/projects/tree/create_directory_spec.rb
View file @
08f1ce90
...
@@ -10,6 +10,8 @@ feature 'Multi-file editor new directory', :js do
...
@@ -10,6 +10,8 @@ feature 'Multi-file editor new directory', :js do
visit
project_tree_path
(
project
,
:master
)
visit
project_tree_path
(
project
,
:master
)
live_debug
wait_for_requests
wait_for_requests
click_link
(
'Web IDE'
)
click_link
(
'Web IDE'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment