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
5a6459e5
Commit
5a6459e5
authored
May 21, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
d6d96cae
bb6d1572
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
app/views/admin/broadcast_messages/index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+2
-2
app/workers/build_finished_worker.rb
app/workers/build_finished_worker.rb
+1
-0
changelogs/unreleased/39304-broadcast-message-buttons.yml
changelogs/unreleased/39304-broadcast-message-buttons.yml
+5
-0
spec/workers/build_finished_worker_spec.rb
spec/workers/build_finished_worker_spec.rb
+1
-0
No files found.
app/views/admin/broadcast_messages/index.html.haml
View file @
5a6459e5
...
...
@@ -32,7 +32,7 @@
%td
=
message
.
ends_at
%td
=
link_to
icon
(
'pencil-square-o'
),
edit_admin_broadcast_message_path
(
message
),
title:
'Edit'
,
class:
'btn btn-sm
'
=
link_to
icon
(
'times'
),
admin_broadcast_message_path
(
message
),
method: :delete
,
remote:
true
,
title:
'Remove'
,
class:
'js-remove-tr btn btn-sm
btn-danger'
=
link_to
sprite_icon
(
'pencil-square'
),
edit_admin_broadcast_message_path
(
message
),
title:
'Edit'
,
class:
'btn
'
=
link_to
sprite_icon
(
'remove'
),
admin_broadcast_message_path
(
message
),
method: :delete
,
remote:
true
,
title:
'Remove'
,
class:
'js-remove-tr btn
btn-danger'
=
paginate
@broadcast_messages
,
theme:
'gitlab'
app/workers/build_finished_worker.rb
View file @
5a6459e5
...
...
@@ -30,6 +30,7 @@ class BuildFinishedWorker
# We execute these async as these are independent operations.
BuildHooksWorker
.
perform_async
(
build
.
id
)
ArchiveTraceWorker
.
perform_async
(
build
.
id
)
ExpirePipelineCacheWorker
.
perform_async
(
build
.
pipeline_id
)
ChatNotificationWorker
.
perform_async
(
build
.
id
)
if
build
.
pipeline
.
chat?
end
end
...
...
changelogs/unreleased/39304-broadcast-message-buttons.yml
0 → 100644
View file @
5a6459e5
---
title
:
Update broadcast message action icons
merge_request
:
28496
author
:
Jarek Ostrowski @jareko
type
:
fixed
spec/workers/build_finished_worker_spec.rb
View file @
5a6459e5
...
...
@@ -17,6 +17,7 @@ describe BuildFinishedWorker do
expect_any_instance_of
(
BuildCoverageWorker
).
to
receive
(
:perform
)
expect
(
BuildHooksWorker
).
to
receive
(
:perform_async
)
expect
(
ArchiveTraceWorker
).
to
receive
(
:perform_async
)
expect
(
ExpirePipelineCacheWorker
).
to
receive
(
:perform_async
)
described_class
.
new
.
perform
(
build
.
id
)
end
...
...
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