diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 5 | ||||
| -rw-r--r-- | lib/api/helpers/presentable.rb | 29 | ||||
| -rw-r--r-- | lib/api/triggers.rb | 10 |
3 files changed, 6 insertions, 38 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 9c2683702e7..fd36381aa51 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1161,11 +1161,8 @@ module API end class Trigger < Grape::Entity - include ::API::Helpers::Presentable - expose :id - expose :token - expose :description + expose :token, :description expose :created_at, :updated_at, :last_used expose :owner, using: Entities::UserBasic end diff --git a/lib/api/helpers/presentable.rb b/lib/api/helpers/presentable.rb deleted file mode 100644 index 973c2132efe..00000000000 --- a/lib/api/helpers/presentable.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -module API - module Helpers - ## - # This module makes it possible to use `app/presenters` with - # Grape Entities. It instantiates model presenter and passes - # options defined in the API endpoint to the presenter itself. - # - # present object, with: Entities::Something, - # current_user: current_user, - # another_option: 'my options' - # - # Example above will make `current_user` and `another_option` - # values available in the subclass of `Gitlab::View::Presenter` - # thorough a separate method in the presenter. - # - # The model class needs to have `::Presentable` module mixed in - # if you want to use `API::Helpers::Presentable`. - # - module Presentable - extend ActiveSupport::Concern - - def initialize(object, options = {}) - super(object.present(options), options) - end - end - end -end diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb index f3a0d7b7b43..f784c857883 100644 --- a/lib/api/triggers.rb +++ b/lib/api/triggers.rb @@ -51,7 +51,7 @@ module API triggers = user_project.triggers.includes(:trigger_requests) - present paginate(triggers), with: Entities::Trigger, current_user: current_user + present paginate(triggers), with: Entities::Trigger end # rubocop: enable CodeReuse/ActiveRecord @@ -68,7 +68,7 @@ module API trigger = user_project.triggers.find(params.delete(:trigger_id)) break not_found!('Trigger') unless trigger - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger end desc 'Create a trigger' do @@ -85,7 +85,7 @@ module API declared_params(include_missing: false).merge(owner: current_user)) if trigger.valid? - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger else render_validation_error!(trigger) end @@ -106,7 +106,7 @@ module API break not_found!('Trigger') unless trigger if trigger.update(declared_params(include_missing: false)) - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger else render_validation_error!(trigger) end @@ -127,7 +127,7 @@ module API if trigger.update(owner: current_user) status :ok - present trigger, with: Entities::Trigger, current_user: current_user + present trigger, with: Entities::Trigger else render_validation_error!(trigger) end |