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
e00dd29f
Commit
e00dd29f
authored
Nov 14, 2019
by
leiminghuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
amend some weekness according code review
parent
af8e41a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
...cripts/sidebar/components/subscriptions/subscriptions.vue
+3
-3
app/serializers/issuable_sidebar_extras_entity.rb
app/serializers/issuable_sidebar_extras_entity.rb
+1
-1
changelogs/unreleased/31184-refactor-disabled-sidebar-notification-to-vue.yml
...d/31184-refactor-disabled-sidebar-notification-to-vue.yml
+2
-2
No files found.
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
View file @
e00dd29f
...
...
@@ -29,7 +29,7 @@ export default {
projectEmailsDisabled
:
{
type
:
Boolean
,
required
:
false
,
default
:
null
,
default
:
false
,
},
subscribeDisabledDescription
:
{
type
:
String
,
...
...
@@ -65,7 +65,7 @@ export default {
},
notificationText
()
{
if
(
this
.
projectEmailsDisabled
)
{
return
__
(
this
.
subscribeDisabledDescription
)
;
return
this
.
subscribeDisabledDescription
;
}
return
__
(
'
Notifications
'
);
},
...
...
@@ -120,7 +120,7 @@ export default {
</span>
<span
class=
"issuable-header-text hide-collapsed float-left"
>
{{
notificationText
}}
</span>
<toggle-button
v-if=
"
projectEmailsDisabled != true
"
v-if=
"
!projectEmailsDisabled
"
ref=
"toggleButton"
:is-loading=
"showLoadingState"
:value=
"subscribed"
...
...
app/serializers/issuable_sidebar_extras_entity.rb
View file @
e00dd29f
...
...
@@ -13,7 +13,7 @@ class IssuableSidebarExtrasEntity < Grape::Entity
issuable
.
project
.
emails_disabled?
end
expose
:subscribe_disabled_description
do
|
issuable
|
expose
:subscribe_disabled_description
do
notification_description
(
:owner_disabled
)
end
...
...
changelogs/unreleased/31184-refactor-disabled-sidebar-notification-to-vue.yml
View file @
e00dd29f
---
title
:
Refactor disabled sidebar notifications to Vue
merge_request
:
!19532
merge_request
:
20007
author
:
minghuan lei
type
:
deprecated
type
:
other
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