diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-31 16:08:11 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-31 16:08:11 -0500 |
| commit | 1cf167fc3e61c6c78e3bf2ba15a02f7ab317294c (patch) | |
| tree | 05fda8866fb5634be495b526d06f00f02b18ea35 /app/serializers/merge_request_basic_entity.rb | |
| parent | c73c1a20e3c5a66a71758c4809faf2f69df25392 (diff) | |
| parent | 0134079430f0179c527d388539c0986352bca9bd (diff) | |
| download | gitlab-ce-1cf167fc3e61c6c78e3bf2ba15a02f7ab317294c.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
* master: (84 commits)
Migrate Gitlab::Git::Wiki#page to Gitaly
Load participants async
Normalize LDAP DN when looking up identity
Improve the maintenance policy page
add changelog
fix spec failure
Allow promoting project milestones to group milestones
fix specs
Be able to bundle gems with newer rubies
Upgrade Ruby to 2.3.5
fixed up upload feature after master merge
fix missing issue assignees
Migrate Gitlab::Git::Wiki#delete_page to Gitaly
Enable eslint
Make `#hashed_storage?` require feature argument
Adds callback function to inital cluster request
Fix example typo.
Upload files through the multi-file editor
get branch name from the DOM
Resolve "Convert autosize.js library to be a Yarn managed library"
...
Diffstat (limited to 'app/serializers/merge_request_basic_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_basic_entity.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/serializers/merge_request_basic_entity.rb b/app/serializers/merge_request_basic_entity.rb index 8461f158bb5..d54a6516aed 100644 --- a/app/serializers/merge_request_basic_entity.rb +++ b/app/serializers/merge_request_basic_entity.rb @@ -1,11 +1,7 @@ -class MergeRequestBasicEntity < Grape::Entity +class MergeRequestBasicEntity < IssuableSidebarEntity expose :assignee_id expose :merge_status expose :merge_error expose :state expose :source_branch_exists?, as: :source_branch_exists - expose :time_estimate - expose :total_time_spent - expose :human_time_estimate - expose :human_total_time_spent end |