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
17967095
Commit
17967095
authored
Jan 07, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
fcd81c77
f2c7f3d0
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
57 additions
and
50 deletions
+57
-50
app/assets/javascripts/gl_form.js
app/assets/javascripts/gl_form.js
+0
-2
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+3
-15
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+0
-9
app/assets/javascripts/pipelines/components/pipeline_url.vue
app/assets/javascripts/pipelines/components/pipeline_url.vue
+23
-11
app/views/shared/notes/_form.html.haml
app/views/shared/notes/_form.html.haml
+2
-2
changelogs/unreleased/53796-discard-draft-comment-button-to-easy-to-accidentally-hit-on-mobile.yml
...-comment-button-to-easy-to-accidentally-hit-on-mobile.yml
+5
-0
changelogs/unreleased/55721-externalization-for-pipeline-tags.yml
...gs/unreleased/55721-externalization-for-pipeline-tags.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+15
-0
spec/javascripts/ide/components/file_finder/index_spec.js
spec/javascripts/ide/components/file_finder/index_spec.js
+0
-1
spec/javascripts/notes/components/comment_form_spec.js
spec/javascripts/notes/components/comment_form_spec.js
+0
-1
yarn.lock
yarn.lock
+4
-9
No files found.
app/assets/javascripts/gl_form.js
View file @
17967095
...
...
@@ -51,8 +51,6 @@ export default class GLForm {
// form and textarea event listeners
this
.
addEventListeners
();
addMarkdownListeners
(
this
.
form
);
// hide discard button
this
.
form
.
find
(
'
.js-note-discard
'
).
hide
();
this
.
form
.
show
();
if
(
this
.
isAutosizeable
)
this
.
setupAutosize
();
}
...
...
app/assets/javascripts/notes.js
View file @
17967095
...
...
@@ -138,8 +138,6 @@ export default class Notes {
this
.
$wrapperEl
.
on
(
'
click
'
,
'
.js-note-delete
'
,
this
.
removeNote
);
// delete note attachment
this
.
$wrapperEl
.
on
(
'
click
'
,
'
.js-note-attachment-delete
'
,
this
.
removeAttachment
);
// reset main target form when clicking discard
this
.
$wrapperEl
.
on
(
'
click
'
,
'
.js-note-discard
'
,
this
.
resetMainTargetForm
);
// update the file name when an attachment is selected
this
.
$wrapperEl
.
on
(
'
change
'
,
'
.js-note-attachment-input
'
,
this
.
updateFormAttachment
);
// reply to diff/discussion notes
...
...
@@ -191,7 +189,6 @@ export default class Notes {
this
.
$wrapperEl
.
off
(
'
keyup input
'
,
'
.js-note-text
'
);
this
.
$wrapperEl
.
off
(
'
click
'
,
'
.js-note-target-reopen
'
);
this
.
$wrapperEl
.
off
(
'
click
'
,
'
.js-note-target-close
'
);
this
.
$wrapperEl
.
off
(
'
click
'
,
'
.js-note-discard
'
);
this
.
$wrapperEl
.
off
(
'
keydown
'
,
'
.js-note-text
'
);
this
.
$wrapperEl
.
off
(
'
click
'
,
'
.js-comment-resolve-button
'
);
this
.
$wrapperEl
.
off
(
'
click
'
,
'
.system-note-commit-list-toggler
'
);
...
...
@@ -986,11 +983,9 @@ export default class Notes {
form
.
find
(
'
#note_position
'
).
val
(
dataHolder
.
attr
(
'
data-position
'
));
form
.
find
(
'
.js-
note-discard
'
)
.
find
(
'
.js-
close-discussion-note-form
'
)
.
show
()
.
removeClass
(
'
js-note-discard
'
)
.
addClass
(
'
js-close-discussion-note-form
'
)
.
text
(
form
.
find
(
'
.js-close-discussion-note-form
'
).
data
(
'
cancelText
'
));
.
removeClass
(
'
hide
'
);
form
.
find
(
'
.js-note-target-close
'
).
remove
();
form
.
find
(
'
.js-note-new-discussion
'
).
remove
();
this
.
setupNoteForm
(
form
);
...
...
@@ -1194,12 +1189,11 @@ export default class Notes {
}
updateTargetButtons
(
e
)
{
var
closebtn
,
closetext
,
discardbtn
,
form
,
reopenbtn
,
reopentext
,
textarea
;
var
closebtn
,
closetext
,
form
,
reopenbtn
,
reopentext
,
textarea
;
textarea
=
$
(
e
.
target
);
form
=
textarea
.
parents
(
'
form
'
);
reopenbtn
=
form
.
find
(
'
.js-note-target-reopen
'
);
closebtn
=
form
.
find
(
'
.js-note-target-close
'
);
discardbtn
=
form
.
find
(
'
.js-note-discard
'
);
if
(
textarea
.
val
().
trim
().
length
>
0
)
{
reopentext
=
reopenbtn
.
attr
(
'
data-alternative-text
'
);
...
...
@@ -1216,9 +1210,6 @@ export default class Notes {
if
(
closebtn
.
is
(
'
:not(.btn-comment-and-close)
'
))
{
closebtn
.
addClass
(
'
btn-comment-and-close
'
);
}
if
(
discardbtn
.
is
(
'
:hidden
'
))
{
return
discardbtn
.
show
();
}
}
else
{
reopentext
=
reopenbtn
.
data
(
'
originalText
'
);
closetext
=
closebtn
.
data
(
'
originalText
'
);
...
...
@@ -1234,9 +1225,6 @@ export default class Notes {
if
(
closebtn
.
is
(
'
.btn-comment-and-close
'
))
{
closebtn
.
removeClass
(
'
btn-comment-and-close
'
);
}
if
(
discardbtn
.
is
(
'
:visible
'
))
{
return
discardbtn
.
hide
();
}
}
}
...
...
app/assets/javascripts/notes/components/comment_form.vue
View file @
17967095
...
...
@@ -431,15 +431,6 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
:label=
"issueActionButtonTitle"
@
click=
"handleSave(true);"
/>
<button
v-if=
"note.length"
type=
"button"
class=
"btn btn-cancel js-note-discard"
@
click=
"discard"
>
Discard draft
</button>
</div>
</form>
</div>
...
...
app/assets/javascripts/pipelines/components/pipeline_url.vue
View file @
17967095
<
script
>
import
{
GlLink
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
_
from
'
underscore
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
popover
from
'
~/vue_shared/directives/popover
'
;
const
popoverTitle
=
sprintf
(
_
.
escape
(
__
(
`This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}`
,
),
),
{
strongStart
:
'
<b>
'
,
strongEnd
:
'
</b>
'
},
false
,
);
export
default
{
components
:
{
UserAvatarLink
,
...
...
@@ -32,14 +44,14 @@ export default {
trigger
:
'
focus
'
,
placement
:
'
top
'
,
title
:
`<div class="autodevops-title">
This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>
${
popoverTitle
}
</div>`
,
content
:
`<a
class="autodevops-link"
href="
${
this
.
autoDevopsHelpPath
}
"
target="_blank"
rel="noopener noreferrer nofollow">
Learn more about Auto DevOps
${
_
.
escape
(
__
(
'
Learn more about Auto DevOps
'
))}
</a>`
,
};
},
...
...
@@ -54,9 +66,9 @@ export default {
<span>
by
</span>
<user-avatar-link
v-if=
"user"
:link-href=
"
pipeline.
user.path"
:img-src=
"
pipeline.
user.avatar_url"
:tooltip-text=
"
pipeline.
user.name"
:link-href=
"user.path"
:img-src=
"user.avatar_url"
:tooltip-text=
"user.name"
class=
"js-pipeline-url-user"
/>
<span
v-if=
"!user"
class=
"js-pipeline-url-api api"
>
API
</span>
...
...
@@ -64,10 +76,10 @@ export default {
<span
v-if=
"pipeline.flags.latest"
v-gl-tooltip
class=
"js-pipeline-url-latest badge badge-success"
:title=
"__('Latest pipeline for this branch')"
class=
"js-pipeline-url-latest badge badge-success"
>
latest
{{
__
(
'
latest
'
)
}}
</span>
<span
v-if=
"pipeline.flags.yaml_errors"
...
...
@@ -75,7 +87,7 @@ export default {
:title=
"pipeline.yaml_errors"
class=
"js-pipeline-url-yaml badge badge-danger"
>
yaml invalid
{{
__
(
'
yaml invalid
'
)
}}
</span>
<span
v-if=
"pipeline.flags.failure_reason"
...
...
@@ -83,7 +95,7 @@ export default {
:title=
"pipeline.failure_reason"
class=
"js-pipeline-url-failure badge badge-danger"
>
error
{{
__
(
'
error
'
)
}}
</span>
<gl-link
v-if=
"pipeline.flags.auto_devops"
...
...
@@ -95,7 +107,7 @@ export default {
Auto DevOps
</gl-link>
<span
v-if=
"pipeline.flags.stuck"
class=
"js-pipeline-url-stuck badge badge-warning"
>
stuck
{{
__
(
'
stuck
'
)
}}
</span>
<span
v-if=
"pipeline.flags.merge_request"
...
...
@@ -103,7 +115,7 @@ export default {
:title=
"__('This pipeline is run in a merge request context')"
class=
"js-pipeline-url-mergerequest badge badge-info"
>
merge request
{{
__
(
'
merge request
'
)
}}
</span>
</div>
</div>
...
...
app/views/shared/notes/_form.html.haml
View file @
17967095
...
...
@@ -40,5 +40,5 @@
=
yield
(
:note_actions
)
%a
.btn.btn-cancel.js-
note-discard
{
role:
"button"
,
data:
{
cancel_text:
"Cancel"
}
}
Discard draft
%a
.btn.btn-cancel.js-
close-discussion-note-form.hide
{
role:
"button"
,
data:
{
cancel_text:
"Cancel"
}
}
Cancel
changelogs/unreleased/53796-discard-draft-comment-button-to-easy-to-accidentally-hit-on-mobile.yml
0 → 100644
View file @
17967095
---
title
:
Removed discard draft comment button form notes
merge_request
:
24185
author
:
type
:
removed
changelogs/unreleased/55721-externalization-for-pipeline-tags.yml
0 → 100644
View file @
17967095
---
title
:
Correctly externalize pipeline tags
merge_request
:
24028
author
:
type
:
fixed
locale/gitlab.pot
View file @
17967095
...
...
@@ -8934,6 +8934,9 @@ msgstr ""
msgid "This pipeline is run in a merge request context"
msgstr ""
msgid "This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}"
msgstr ""
msgid "This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>"
msgstr ""
...
...
@@ -10410,6 +10413,9 @@ msgstr[1] ""
msgid "enabled"
msgstr ""
msgid "error"
msgstr ""
msgid "error code:"
msgstr ""
...
...
@@ -10475,6 +10481,9 @@ msgstr ""
msgid "it is too large"
msgstr ""
msgid "latest"
msgstr ""
msgid "latest deployment"
msgstr ""
...
...
@@ -10801,6 +10810,9 @@ msgstr ""
msgid "started"
msgstr ""
msgid "stuck"
msgstr ""
msgid "this document"
msgstr ""
...
...
@@ -10832,3 +10844,6 @@ msgid "within %d minute "
msgid_plural "within %d minutes "
msgstr[0] ""
msgstr[1] ""
msgid "yaml invalid"
msgstr ""
spec/javascripts/ide/components/file_finder/index_spec.js
View file @
17967095
...
...
@@ -56,7 +56,6 @@ describe('IDE File finder item spec', () => {
it
(
'
renders list of blobs
'
,
()
=>
{
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
index.js
'
);
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
component.js
'
);
expect
(
vm
.
$el
.
textContent
).
not
.
toContain
(
'
folder
'
);
});
...
...
spec/javascripts/notes/components/comment_form_spec.js
View file @
17967095
...
...
@@ -223,7 +223,6 @@ describe('issue_comment_form component', () => {
'
Comment & close issue
'
,
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-note-discard
'
)).
toBeDefined
();
done
();
});
});
...
...
yarn.lock
View file @
17967095
...
...
@@ -9887,9 +9887,9 @@ vue-style-loader@^4.1.0:
loader-utils "^1.0.2"
vue-template-compiler@^2.5.0, vue-template-compiler@^2.5.17:
version "2.5.
17
"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.
17.tgz#52a4a078c327deb937482a509ae85c06f346c3cb
"
integrity sha512-
63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg
==
version "2.5.
21
"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.
21.tgz#a57ceb903177e8f643560a8d639a0f8db647054a
"
integrity sha512-
Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw
==
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
...
...
@@ -9904,12 +9904,7 @@ vue-virtual-scroll-list@^1.2.5:
resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.2.5.tgz#bcbd010f7cdb035eba8958ebf807c6214d9a167a"
integrity sha1-vL0BD3zbA166iVjr+AfGIU2aFno=
vue@^2.5.17:
version "2.5.17"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada"
integrity sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==
vue@^2.5.21:
vue@^2.5.17, vue@^2.5.21:
version "2.5.21"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85"
integrity sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ==
...
...
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