diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-22 09:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-22 09:08:19 +0300 |
| commit | 1064597e1c145474e270be1e926e5a2a7a6113a5 (patch) | |
| tree | 9126bc0a20041b1cedefe4de446471e6c62feeb9 /app | |
| parent | 5df283c155954eb00ce7e1cfc1bb8ea5e051b4d5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/graphql/types/merge_request_type.rb | 4 | ||||
| -rw-r--r-- | app/services/merge_requests/merge_to_ref_service.rb | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb index f32dfc0dbcf..99c719f1402 100644 --- a/app/graphql/types/merge_request_type.rb +++ b/app/graphql/types/merge_request_type.rb @@ -35,7 +35,7 @@ module Types field :iid, GraphQL::Types::String, null: false, description: 'Internal ID of the merge request.' field :merge_when_pipeline_succeeds, GraphQL::Types::Boolean, null: true, - description: 'Indicates if the merge has been set to be merged when its pipeline succeeds (MWPS).' + description: 'Indicates if the merge has been set to auto-merge.' field :merged_at, Types::TimeType, null: true, complexity: 5, description: 'Timestamp of when the merge request was merged, null if not merged.' field :project, Types::ProjectType, null: false, @@ -207,7 +207,7 @@ module Types field :has_ci, GraphQL::Types::Boolean, null: false, method: :has_ci?, description: 'Indicates if the merge request has CI.' field :merge_user, Types::UserType, null: true, - description: 'User who merged this merge request or set it to merge when pipeline succeeds.' + description: 'User who merged this merge request or set it to auto-merge.' field :mergeable, GraphQL::Types::Boolean, null: false, method: :mergeable?, calls_gitaly: true, description: 'Indicates if the merge request is mergeable.' field :security_auto_fix, GraphQL::Types::Boolean, null: true, diff --git a/app/services/merge_requests/merge_to_ref_service.rb b/app/services/merge_requests/merge_to_ref_service.rb index 1bd26f06e41..acd3bc36e1d 100644 --- a/app/services/merge_requests/merge_to_ref_service.rb +++ b/app/services/merge_requests/merge_to_ref_service.rb @@ -56,13 +56,6 @@ module MergeRequests params[:first_parent_ref] || merge_request.target_branch_ref end - ## - # The parameter `allow_conflicts` is a flag whether merge conflicts should be merged into diff - # Default is false - def allow_conflicts - params[:allow_conflicts] || false - end - def commit(cache_merge_to_ref_calls = false) if cache_merge_to_ref_calls Rails.cache.fetch(cache_key, expires_in: 1.day) do @@ -79,8 +72,7 @@ module MergeRequests branch: merge_request.target_branch, target_ref: target_ref, message: commit_message, - first_parent_ref: first_parent_ref, - allow_conflicts: allow_conflicts) + first_parent_ref: first_parent_ref) rescue Gitlab::Git::PreReceiveError, Gitlab::Git::CommandError => error raise MergeError, error.message end |