Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mastofe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
35
Issues
35
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pleroma
mastofe
Commits
cdc9f4dd
Verified
Commit
cdc9f4dd
authored
Mar 03, 2019
by
Haelwenn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unsupported Delete&Redraft
parent
4fd06791
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
3 deletions
+0
-3
app/javascript/flavours/glitch/components/status_action_bar.js
...avascript/flavours/glitch/components/status_action_bar.js
+0
-1
app/javascript/flavours/glitch/features/status/components/action_bar.js
.../flavours/glitch/features/status/components/action_bar.js
+0
-1
app/javascript/mastodon/components/status_action_bar.js
app/javascript/mastodon/components/status_action_bar.js
+0
-1
No files found.
app/javascript/flavours/glitch/components/status_action_bar.js
View file @
cdc9f4dd
...
...
@@ -220,7 +220,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
}
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
delete
),
action
:
this
.
handleDeleteClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
redraft
),
action
:
this
.
handleRedraftClick
});
}
else
{
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
mention
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleMentionClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
direct
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleDirectClick
});
...
...
app/javascript/flavours/glitch/features/status/components/action_bar.js
View file @
cdc9f4dd
...
...
@@ -162,7 +162,6 @@ export default class ActionBar extends React.PureComponent {
menu
.
push
({
text
:
intl
.
formatMessage
(
mutingConversation
?
messages
.
unmuteConversation
:
messages
.
muteConversation
),
action
:
this
.
handleConversationMuteClick
});
menu
.
push
(
null
);
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
delete
),
action
:
this
.
handleDeleteClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
redraft
),
action
:
this
.
handleRedraftClick
});
}
else
{
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
mention
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleMentionClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
direct
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleDirectClick
});
...
...
app/javascript/mastodon/components/status_action_bar.js
View file @
cdc9f4dd
...
...
@@ -213,7 +213,6 @@ class StatusActionBar extends ImmutablePureComponent {
}
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
delete
),
action
:
this
.
handleDeleteClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
redraft
),
action
:
this
.
handleRedraftClick
});
}
else
{
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
mention
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleMentionClick
});
menu
.
push
({
text
:
intl
.
formatMessage
(
messages
.
direct
,
{
name
:
status
.
getIn
([
'
account
'
,
'
username
'
])
}),
action
:
this
.
handleDirectClick
});
...
...
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