diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 21:09:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 21:09:57 +0300 |
| commit | a8476fe0cd764ac054763032b7cf6e63b0b493c5 (patch) | |
| tree | ba2685026667de0b5d67c75bf98bb87014f01b32 /spec/graphql | |
| parent | 68d7192881c41305da9c6aa1e3f7dd8b47f286a7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/graphql')
| -rw-r--r-- | spec/graphql/types/merge_request_type_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/graphql/types/merge_request_type_spec.rb b/spec/graphql/types/merge_request_type_spec.rb index 8c5daa1cdd3..875a16a79e5 100644 --- a/spec/graphql/types/merge_request_type_spec.rb +++ b/spec/graphql/types/merge_request_type_spec.rb @@ -30,8 +30,8 @@ RSpec.describe GitlabSchema.types['MergeRequest'] do source_branch_exists target_branch_exists diverged_from_target_branch upvotes downvotes head_pipeline pipelines task_completion_status milestone assignees reviewers participants subscribed labels discussion_locked time_estimate - total_time_spent reference author merged_at commit_count current_user_todos - conflicts auto_merge_enabled approved_by source_branch_protected + total_time_spent human_time_estimate human_total_time_spent reference author merged_at + commit_count current_user_todos conflicts auto_merge_enabled approved_by source_branch_protected default_merge_commit_message_with_description squash_on_merge available_auto_merge_strategies has_ci mergeable commits_without_merge_commits squash security_auto_fix default_squash_commit_message auto_merge_strategy merge_user |