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
4e19db62
Commit
4e19db62
authored
Jun 25, 2018
by
Andreas Kämmerle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change button text to more specific Discard draft
parent
901159bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+1
-1
app/views/shared/notes/_form.html.haml
app/views/shared/notes/_form.html.haml
+1
-1
spec/features/projects/commit/comments/user_adds_comment_spec.rb
...atures/projects/commit/comments/user_adds_comment_spec.rb
+1
-1
No files found.
app/assets/javascripts/notes/components/note_form.vue
View file @
4e19db62
...
@@ -194,7 +194,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
...
@@ -194,7 +194,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
class=
"btn btn-cancel note-edit-cancel js-close-discussion-note-form"
class=
"btn btn-cancel note-edit-cancel js-close-discussion-note-form"
type=
"button"
type=
"button"
@
click=
"cancelHandler()"
>
@
click=
"cancelHandler()"
>
Cancel
Discard draft
</button>
</button>
</div>
</div>
</form>
</form>
...
...
app/views/shared/notes/_form.html.haml
View file @
4e19db62
...
@@ -40,5 +40,5 @@
...
@@ -40,5 +40,5 @@
=
yield
(
:note_actions
)
=
yield
(
:note_actions
)
%a
.btn.btn-cancel.js-note-discard
{
role:
"button"
,
data:
{
cancel_text:
"
Cancel
"
}
}
%a
.btn.btn-cancel.js-note-discard
{
role:
"button"
,
data:
{
cancel_text:
"
Discard draft
"
}
}
Discard draft
Discard draft
spec/features/projects/commit/comments/user_adds_comment_spec.rb
View file @
4e19db62
...
@@ -62,7 +62,7 @@ describe "User adds a comment on a commit", :js do
...
@@ -62,7 +62,7 @@ describe "User adds a comment on a commit", :js do
click_diff_line
(
sample_commit
.
line_code
)
click_diff_line
(
sample_commit
.
line_code
)
expect
(
page
).
to
have_css
(
".js-temp-notes-holder form.new-note"
)
expect
(
page
).
to
have_css
(
".js-temp-notes-holder form.new-note"
)
.
and
have_css
(
".js-close-discussion-note-form"
,
text:
"
Cancel
"
)
.
and
have_css
(
".js-close-discussion-note-form"
,
text:
"
Discard draft
"
)
# The `Cancel` button closes the current form. The page should not have any open forms after that.
# The `Cancel` button closes the current form. The page should not have any open forms after that.
find
(
".js-close-discussion-note-form"
).
click
find
(
".js-close-discussion-note-form"
).
click
...
...
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