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
971caaaf
Commit
971caaaf
authored
Sep 02, 2020
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add design_management_todo_button feature flag
parent
83fdaaef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
app/assets/javascripts/design_management/components/design_sidebar.vue
...vascripts/design_management/components/design_sidebar.vue
+11
-1
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-0
No files found.
app/assets/javascripts/design_management/components/design_sidebar.vue
View file @
971caaaf
...
@@ -99,7 +99,11 @@ export default {
...
@@ -99,7 +99,11 @@ export default {
updateDiscussionWithOpenForm
(
id
)
{
updateDiscussionWithOpenForm
(
id
)
{
this
.
discussionWithOpenForm
=
id
;
this
.
discussionWithOpenForm
=
id
;
},
},
toggleTodo
()
{
// TODO implement
},
},
},
showTodoButton
:
gon
.
features
?.
designManagementTodoButton
,
resolveCommentsToggleText
:
s__
(
'
DesignManagement|Resolved Comments
'
),
resolveCommentsToggleText
:
s__
(
'
DesignManagement|Resolved Comments
'
),
cookieKey
:
'
hide_design_resolved_comments_popover
'
,
cookieKey
:
'
hide_design_resolved_comments_popover
'
,
};
};
...
@@ -108,10 +112,16 @@ export default {
...
@@ -108,10 +112,16 @@ export default {
<
template
>
<
template
>
<div
class=
"image-notes"
@
click=
"handleSidebarClick"
>
<div
class=
"image-notes"
@
click=
"handleSidebarClick"
>
<div
<div
v-if=
"$options.showTodoButton"
class=
"gl-display-flex gl-justify-content-space-between gl-border-b-1 gl-border-b-gray-100"
class=
"gl-display-flex gl-justify-content-space-between gl-border-b-1 gl-border-b-gray-100"
>
>
<span>
{{
__
(
'
To-Do
'
)
}}
</span>
<span>
{{
__
(
'
To-Do
'
)
}}
</span>
<todo-button
issuable-type=
"design"
:issuable-id=
"design.iid"
:is-todo=
"hasPendingTodo"
/>
<todo-button
issuable-type=
"design"
:issuable-id=
"design.iid"
:is-todo=
"hasPendingTodo"
@
click=
"toggleTodo"
/>
</div>
</div>
<h2
class=
"gl-font-weight-bold gl-mt-0"
>
<h2
class=
"gl-font-weight-bold gl-mt-0"
>
{{
issue
.
title
}}
{{
issue
.
title
}}
...
...
app/controllers/projects/issues_controller.rb
View file @
971caaaf
...
@@ -49,6 +49,7 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -49,6 +49,7 @@ class Projects::IssuesController < Projects::ApplicationController
push_frontend_feature_flag
(
:vue_issuable_sidebar
,
project
.
group
)
push_frontend_feature_flag
(
:vue_issuable_sidebar
,
project
.
group
)
push_frontend_feature_flag
(
:tribute_autocomplete
,
@project
)
push_frontend_feature_flag
(
:tribute_autocomplete
,
@project
)
push_frontend_feature_flag
(
:vue_issuables_list
,
project
)
push_frontend_feature_flag
(
:vue_issuables_list
,
project
)
push_frontend_feature_flag
(
:design_management_todo_button
,
project
)
end
end
before_action
only: :show
do
before_action
only: :show
do
...
...
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