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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
29f414aa
Commit
29f414aa
authored
Mar 30, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tests update
parent
40297b8f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-1
features/steps/shared/diff_note.rb
features/steps/shared/diff_note.rb
+2
-2
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+1
-1
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+1
-1
spec/javascripts/fixtures/zen_mode.html.haml
spec/javascripts/fixtures/zen_mode.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
29f414aa
...
@@ -155,7 +155,7 @@ ul.notes {
...
@@ -155,7 +155,7 @@ ul.notes {
&
.notes_content
{
&
.notes_content
{
background-color
:
#fff
;
background-color
:
#fff
;
border-width
:
1px
0
;
border-width
:
1px
0
;
padding
-top
:
0
;
padding
:
0
;
vertical-align
:
top
;
vertical-align
:
top
;
&
.parallel
{
&
.parallel
{
border-width
:
1px
;
border-width
:
1px
;
...
...
features/steps/shared/diff_note.rb
View file @
29f414aa
...
@@ -125,7 +125,7 @@ module SharedDiffNote
...
@@ -125,7 +125,7 @@ module SharedDiffNote
step
'I should only see one diff form'
do
step
'I should only see one diff form'
do
page
.
within
(
diff_file_selector
)
do
page
.
within
(
diff_file_selector
)
do
expect
(
page
).
to
have_css
(
"form.new
_
note"
,
count:
1
)
expect
(
page
).
to
have_css
(
"form.new
-
note"
,
count:
1
)
end
end
end
end
...
@@ -161,7 +161,7 @@ module SharedDiffNote
...
@@ -161,7 +161,7 @@ module SharedDiffNote
step
'I should see a temporary diff comment form'
do
step
'I should see a temporary diff comment form'
do
page
.
within
(
diff_file_selector
)
do
page
.
within
(
diff_file_selector
)
do
expect
(
page
).
to
have_css
(
".js-temp-notes-holder form.new
_
note"
)
expect
(
page
).
to
have_css
(
".js-temp-notes-holder form.new
-
note"
)
end
end
end
end
...
...
spec/features/issues_spec.rb
View file @
29f414aa
...
@@ -22,7 +22,7 @@ describe 'Issues', feature: true do
...
@@ -22,7 +22,7 @@ describe 'Issues', feature: true do
before
do
before
do
visit
edit_namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
visit
edit_namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
click_
link
"Edit
"
click_
button
"Go full screen
"
end
end
it
'should open new issue popup'
do
it
'should open new issue popup'
do
...
...
spec/features/notes_on_merge_requests_spec.rb
View file @
29f414aa
...
@@ -152,7 +152,7 @@ describe 'Comments', feature: true do
...
@@ -152,7 +152,7 @@ describe 'Comments', feature: true do
it
'has .new_note css class'
do
it
'has .new_note css class'
do
page
.
within
(
'.js-temp-notes-holder'
)
do
page
.
within
(
'.js-temp-notes-holder'
)
do
expect
(
subject
).
to
have_css
(
'.new
_
note'
)
expect
(
subject
).
to
have_css
(
'.new
-
note'
)
end
end
end
end
end
end
...
...
spec/javascripts/fixtures/zen_mode.html.haml
View file @
29f414aa
.
zennable
.
md-area
.zen-backdrop
.zen-backdrop
%textarea
#note_note
.js-gfm-input.markdown-area
%textarea
#note_note
.js-gfm-input.markdown-area
%a
.js-zen-enter
(
tabindex=
"-1"
href=
"#"
)
%a
.js-zen-enter
(
tabindex=
"-1"
href=
"#"
)
...
...
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