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
b824b9ac
Commit
b824b9ac
authored
Jan 28, 2022
by
Stanislav Lashmanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix duplicate draft help text
Issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/348824
Changelog: fixed
parent
37856ef5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/issuable/issuable_form.js
app/assets/javascripts/issuable/issuable_form.js
+1
-0
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+4
-0
app/views/shared/issuable/form/_title.html.haml
app/views/shared/issuable/form/_title.html.haml
+4
-2
No files found.
app/assets/javascripts/issuable/issuable_form.js
View file @
b824b9ac
...
@@ -77,6 +77,7 @@ export default class IssuableForm {
...
@@ -77,6 +77,7 @@ export default class IssuableForm {
this
.
initAutosave
();
this
.
initAutosave
();
this
.
form
.
on
(
'
submit
'
,
this
.
handleSubmit
);
this
.
form
.
on
(
'
submit
'
,
this
.
handleSubmit
);
this
.
form
.
on
(
'
click
'
,
'
.btn-cancel
'
,
this
.
resetAutosave
);
this
.
form
.
on
(
'
click
'
,
'
.btn-cancel
'
,
this
.
resetAutosave
);
this
.
form
.
find
(
'
.js-unwrap-on-load
'
).
unwrap
();
this
.
initWip
();
this
.
initWip
();
const
$issuableDueDate
=
$
(
'
#issuable-due-date
'
);
const
$issuableDueDate
=
$
(
'
#issuable-due-date
'
);
...
...
app/assets/stylesheets/framework/forms.scss
View file @
b824b9ac
...
@@ -150,6 +150,10 @@ label {
...
@@ -150,6 +150,10 @@ label {
margin-bottom
:
0
;
margin-bottom
:
0
;
margin-top
:
#{
$grid-size
/
2
}
;
margin-top
:
#{
$grid-size
/
2
}
;
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
.invisible
{
visibility
:
hidden
;
}
}
}
.gl-field-error
,
.gl-field-error
,
...
...
app/views/shared/issuable/form/_title.html.haml
View file @
b824b9ac
...
@@ -14,13 +14,15 @@
...
@@ -14,13 +14,15 @@
-
if
issuable
.
respond_to?
(
:work_in_progress?
)
-
if
issuable
.
respond_to?
(
:work_in_progress?
)
.form-text.text-muted
.form-text.text-muted
.js-wip-explanation
.js-wip-explanation
{
style:
"display: none;"
}
=
remove_wip_text
=
remove_wip_text
.js-no-wip-explanation
.js-no-wip-explanation
-
if
has_wip_commits
-
if
has_wip_commits
=
_
(
'It looks like you have some draft commits in this branch.'
)
=
_
(
'It looks like you have some draft commits in this branch.'
)
%br
%br
=
add_wip_text
.invisible
.js-unwrap-on-load
=
add_wip_text
-
if
no_issuable_templates
&&
can?
(
current_user
,
:push_code
,
issuable
.
project
)
-
if
no_issuable_templates
&&
can?
(
current_user
,
:push_code
,
issuable
.
project
)
=
render
'shared/issuable/form/default_templates'
=
render
'shared/issuable/form/default_templates'
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