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
2faf28fe
Commit
2faf28fe
authored
Aug 10, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove forgotten fdescribe
parent
d323bb79
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
4 deletions
+7
-4
app/assets/javascripts/notes/components/issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+1
-1
app/assets/javascripts/notes/components/issue_note_awards_list.vue
...s/javascripts/notes/components/issue_note_awards_list.vue
+2
-2
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+1
-0
features/steps/shared/note.rb
features/steps/shared/note.rb
+2
-0
spec/javascripts/notes_spec.js
spec/javascripts/notes_spec.js
+1
-1
No files found.
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @
2faf28fe
app/assets/javascripts/notes/components/issue_note_awards_list.vue
View file @
2faf28fe
...
@@ -153,8 +153,8 @@
...
@@ -153,8 +153,8 @@
},
},
created
()
{
created
()
{
this
.
emojiSmiling
=
emojiSmiling
;
this
.
emojiSmiling
=
emojiSmiling
;
this
.
emojiSmile
=
this
.
emojiSmile
;
this
.
emojiSmile
=
emojiSmile
;
this
.
emojiSmiley
=
this
.
emojiSmiley
;
this
.
emojiSmiley
=
emojiSmiley
;
},
},
};
};
</
script
>
</
script
>
...
...
features/steps/project/issues/issues.rb
View file @
2faf28fe
...
@@ -168,6 +168,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -168,6 +168,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
author:
project
.
users
.
first
,
author:
project
.
users
.
first
,
description:
"# Description header"
description:
"# Description header"
)
)
wait_for_requests
end
end
step
'project "Shop" have "Tweet control" open issue'
do
step
'project "Shop" have "Tweet control" open issue'
do
...
...
features/steps/shared/note.rb
View file @
2faf28fe
...
@@ -163,5 +163,7 @@ module SharedNote
...
@@ -163,5 +163,7 @@ module SharedNote
page
.
within
(
".note"
)
do
page
.
within
(
".note"
)
do
expect
(
page
).
to
have_content
(
"+1 Awesome!"
)
expect
(
page
).
to
have_content
(
"+1 Awesome!"
)
end
end
wait_for_requests
end
end
end
end
spec/javascripts/notes_spec.js
View file @
2faf28fe
...
@@ -30,7 +30,7 @@ import '~/notes';
...
@@ -30,7 +30,7 @@ import '~/notes';
return
escapedString
;
return
escapedString
;
};
};
f
describe
(
'
Notes
'
,
function
()
{
describe
(
'
Notes
'
,
function
()
{
const
FLASH_TYPE_ALERT
=
'
alert
'
;
const
FLASH_TYPE_ALERT
=
'
alert
'
;
var
commentsTemplate
=
'
merge_requests/merge_request_with_comment.html.raw
'
;
var
commentsTemplate
=
'
merge_requests/merge_request_with_comment.html.raw
'
;
preloadFixtures
(
commentsTemplate
);
preloadFixtures
(
commentsTemplate
);
...
...
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