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
3d8cc03e
Commit
3d8cc03e
authored
Dec 12, 2017
by
Clement Ho
Committed by
Filipa Lacerda
Dec 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add js prefix for issuable-edit (EE Version)
parent
091589a2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/javascripts/issue_show/index.js
app/assets/javascripts/issue_show/index.js
+1
-1
app/assets/javascripts/shortcuts_issuable.js
app/assets/javascripts/shortcuts_issuable.js
+1
-1
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+2
-2
app/views/projects/merge_requests/_mr_title.html.haml
app/views/projects/merge_requests/_mr_title.html.haml
+2
-2
features/steps/shared/issuable.rb
features/steps/shared/issuable.rb
+1
-1
spec/features/issues/gfm_autocomplete_spec.rb
spec/features/issues/gfm_autocomplete_spec.rb
+1
-1
No files found.
app/assets/javascripts/issue_show/index.js
View file @
3d8cc03e
...
...
@@ -7,7 +7,7 @@ document.addEventListener('DOMContentLoaded', () => {
const
initialDataEl
=
document
.
getElementById
(
'
js-issuable-app-initial-data
'
);
const
initialData
=
JSON
.
parse
(
initialDataEl
.
innerHTML
.
replace
(
/"/g
,
'
"
'
));
$
(
'
.issuable-edit
'
).
on
(
'
click
'
,
(
e
)
=>
{
$
(
'
.
js-
issuable-edit
'
).
on
(
'
click
'
,
(
e
)
=>
{
e
.
preventDefault
();
eventHub
.
$emit
(
'
open.form
'
);
...
...
app/assets/javascripts/shortcuts_issuable.js
View file @
3d8cc03e
...
...
@@ -11,7 +11,7 @@ export default class ShortcutsIssuable extends ShortcutsNavigation {
super
();
this
.
$replyField
=
isMergeRequest
?
$
(
'
.js-main-target-form #note_note
'
)
:
$
(
'
.js-main-target-form .js-vue-comment-form
'
);
this
.
editBtn
=
document
.
querySelector
(
'
.issuable-edit
'
);
this
.
editBtn
=
document
.
querySelector
(
'
.
js-
issuable-edit
'
);
Mousetrap
.
bind
(
'
a
'
,
()
=>
ShortcutsIssuable
.
openSidebarDropdown
(
'
assignee
'
));
Mousetrap
.
bind
(
'
m
'
,
()
=>
ShortcutsIssuable
.
openSidebarDropdown
(
'
milestone
'
));
...
...
app/views/projects/issues/show.html.haml
View file @
3d8cc03e
...
...
@@ -43,7 +43,7 @@
.dropdown-menu.dropdown-menu-align-right.hidden-lg
%ul
-
if
can_update_issue
%li
=
link_to
'Edit'
,
edit_project_issue_path
(
@project
,
@issue
),
class:
'issuable-edit'
%li
=
link_to
'Edit'
,
edit_project_issue_path
(
@project
,
@issue
),
class:
'
js-
issuable-edit'
-
unless
current_user
==
@issue
.
author
%li
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
@issue
.
author
.
id
,
ref_url:
issue_url
(
@issue
))
-
if
can_update_issue
...
...
@@ -56,7 +56,7 @@
%li
=
link_to
'New issue'
,
new_project_issue_path
(
@project
),
title:
'New issue'
,
id:
'new_issue_link'
-
if
can_update_issue
=
link_to
'Edit'
,
edit_project_issue_path
(
@project
,
@issue
),
class:
'hidden-xs hidden-sm btn btn-grouped issuable-edit'
=
link_to
'Edit'
,
edit_project_issue_path
(
@project
,
@issue
),
class:
'hidden-xs hidden-sm btn btn-grouped
js-
issuable-edit'
=
render
'shared/issuable/close_reopen_button'
,
issuable:
@issue
,
can_update:
can_update_issue
...
...
app/views/projects/merge_requests/_mr_title.html.haml
View file @
3d8cc03e
...
...
@@ -27,7 +27,7 @@
.dropdown-menu.dropdown-menu-align-right.hidden-lg
%ul
-
if
can_update_merge_request
%li
=
link_to
'Edit'
,
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'issuable-edit'
%li
=
link_to
'Edit'
,
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'
js-
issuable-edit'
-
unless
current_user
==
@merge_request
.
author
%li
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
@merge_request
.
author
.
id
,
ref_url:
merge_request_url
(
@merge_request
))
-
if
can_update_merge_request
...
...
@@ -37,6 +37,6 @@
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'reopen-mr-link'
,
title:
'Reopen merge request'
-
if
can_update_merge_request
=
link_to
'Edit'
,
edit_project_merge_request_path
(
@project
,
@merge_request
),
class:
"hidden-xs hidden-sm btn btn-grouped issuable-edit"
=
link_to
'Edit'
,
edit_project_merge_request_path
(
@project
,
@merge_request
),
class:
"hidden-xs hidden-sm btn btn-grouped
js-
issuable-edit"
=
render
'shared/issuable/close_reopen_button'
,
issuable:
@merge_request
,
can_update:
can_update_merge_request
features/steps/shared/issuable.rb
View file @
3d8cc03e
...
...
@@ -3,7 +3,7 @@ module SharedIssuable
include
WaitForRequests
def
edit_issuable
find
(
'.issuable-edit'
,
visible:
true
).
click
find
(
'.
js-
issuable-edit'
,
visible:
true
).
click
end
step
'project "Community" has "Community issue" open issue'
do
...
...
spec/features/issues/gfm_autocomplete_spec.rb
View file @
3d8cc03e
...
...
@@ -15,7 +15,7 @@ feature 'GFM autocomplete', :js do
end
it
'updates issue descripton with GFM reference'
do
find
(
'.issuable-edit'
).
click
find
(
'.
js-
issuable-edit'
).
click
simulate_input
(
'#issue-description'
,
"@
#{
user
.
name
[
0
...
3
]
}
"
)
...
...
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