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
691da138
Commit
691da138
authored
Jan 18, 2018
by
Rémy Coutable
Committed by
Clement Ho
Jan 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[EE] Make the 'Edit' links consistent in the issuable sidebar
parent
860ef6fe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/sidebar/components/assignees/assignee_title.js
...avascripts/sidebar/components/assignees/assignee_title.js
+1
-1
app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
...ar/components/confidential/confidential_issue_sidebar.vue
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+3
-3
app/views/shared/issuable/_sidebar_assignees.html.haml
app/views/shared/issuable/_sidebar_assignees.html.haml
+1
-1
ee/app/assets/javascripts/sidebar/components/weight/weight.vue
...p/assets/javascripts/sidebar/components/weight/weight.vue
+1
-1
No files found.
app/assets/javascripts/sidebar/components/assignees/assignee_title.js
View file @
691da138
...
...
@@ -39,7 +39,7 @@ export default {
class="js-sidebar-dropdown-toggle edit-link pull-right"
href="#"
>
Edit
{{ __('Edit') }}
</a>
<a
v-if="showToggle"
...
...
app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
View file @
691da138
...
...
@@ -62,7 +62,7 @@
href=
"#"
@
click.prevent=
"toggleForm"
>
Edit
{{
__
(
'
Edit
'
)
}}
</a>
</div>
<div
class=
"value sidebar-item-value hide-collapsed"
>
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
691da138
...
...
@@ -35,7 +35,7 @@
Milestone
=
icon
(
'spinner spin'
,
class:
'hidden block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can_edit_issuable
=
link_to
'Edit'
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
=
link_to
_
(
'Edit'
)
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
.value.hide-collapsed
-
if
issuable
.
milestone
=
link_to
issuable
.
milestone
.
title
,
milestone_path
(
issuable
.
milestone
),
class:
"bold has-tooltip"
,
title:
milestone_tooltip_title
(
issuable
.
milestone
),
data:
{
container:
"body"
,
html:
1
}
...
...
@@ -61,7 +61,7 @@
Due date
=
icon
(
'spinner spin'
,
class:
'hidden block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
=
link_to
'Edit'
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
=
link_to
_
(
'Edit'
)
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
.value.hide-collapsed
%span
.value-content
-
if
issuable
.
due_date
...
...
@@ -96,7 +96,7 @@
Labels
=
icon
(
'spinner spin'
,
class:
'hidden block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can_edit_issuable
=
link_to
'Edit'
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
=
link_to
_
(
'Edit'
)
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
.value.issuable-show-labels.hide-collapsed
{
class:
(
"has-labels"
if
selected_labels
.
any?
)
}
-
if
selected_labels
.
any?
-
selected_labels
.
each
do
|
label
|
...
...
app/views/shared/issuable/_sidebar_assignees.html.haml
View file @
691da138
...
...
@@ -13,7 +13,7 @@
Assignee
=
icon
(
'spinner spin'
,
class:
'hidden block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can_edit_issuable
=
link_to
'Edit'
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
=
link_to
_
(
'Edit'
)
,
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link pull-right'
-
if
!
signed_in
%a
.gutter-toggle.pull-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
"aria-label"
=>
"Toggle sidebar"
}
=
sidebar_gutter_toggle_icon
...
...
ee/app/assets/javascripts/sidebar/components/weight/weight.vue
View file @
691da138
...
...
@@ -173,7 +173,7 @@
href=
"#"
@
click=
"showDropdown"
>
{{
s__
(
'
Sidebar|
Edit
'
)
}}
{{
__
(
'
Edit
'
)
}}
</a>
</div>
<div
...
...
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