diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 06:07:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 06:07:34 +0300 |
commit | 2ccde70b80730fd52f75797e7d711748fb5b769b (patch) | |
tree | bb5b1c2dfa4f99381eabcb0f7783e55d9fad073d /lib/api | |
parent | 2e3cbf7d89815e2915f77677388c49b48f8d20c3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/broadcast_messages.rb | 20 | ||||
-rw-r--r-- | lib/api/entities.rb | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/api/broadcast_messages.rb b/lib/api/broadcast_messages.rb index 19148758fc5..994e12445b7 100644 --- a/lib/api/broadcast_messages.rb +++ b/lib/api/broadcast_messages.rb @@ -32,11 +32,12 @@ module API success Entities::BroadcastMessage end params do - requires :message, type: String, desc: 'Message to display' + requires :message, type: String, desc: 'Message to display' optional :starts_at, type: DateTime, desc: 'Starting time', default: -> { Time.zone.now } - optional :ends_at, type: DateTime, desc: 'Ending time', default: -> { 1.hour.from_now } - optional :color, type: String, desc: 'Background color' - optional :font, type: String, desc: 'Foreground color' + optional :ends_at, type: DateTime, desc: 'Ending time', default: -> { 1.hour.from_now } + optional :color, type: String, desc: 'Background color' + optional :font, type: String, desc: 'Foreground color' + optional :target_path, type: String, desc: 'Target path' end post do message = BroadcastMessage.create(declared_params(include_missing: false)) @@ -66,12 +67,13 @@ module API success Entities::BroadcastMessage end params do - requires :id, type: Integer, desc: 'Broadcast message ID' - optional :message, type: String, desc: 'Message to display' + requires :id, type: Integer, desc: 'Broadcast message ID' + optional :message, type: String, desc: 'Message to display' optional :starts_at, type: DateTime, desc: 'Starting time' - optional :ends_at, type: DateTime, desc: 'Ending time' - optional :color, type: String, desc: 'Background color' - optional :font, type: String, desc: 'Foreground color' + optional :ends_at, type: DateTime, desc: 'Ending time' + optional :color, type: String, desc: 'Background color' + optional :font, type: String, desc: 'Foreground color' + optional :target_path, type: String, desc: 'Target path' end put ':id' do message = find_message diff --git a/lib/api/entities.rb b/lib/api/entities.rb index f89070ea1cb..8a60127ff59 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1217,7 +1217,7 @@ module API end class BroadcastMessage < Grape::Entity - expose :message, :starts_at, :ends_at, :color, :font + expose :message, :starts_at, :ends_at, :color, :font, :target_path end class ApplicationStatistics < Grape::Entity |