Class: Projects::MergeRequestsController

Inherits:
Projects::MergeRequests::ApplicationController
  • Object
show all
Includes:
DiffHelper, Gitlab::Cache::Helpers, IssuableActions, IssuableCollections, Observability::ContentSecurityPolicy, RecordUserLastActivity, RendersAssignees, RendersCommits, SourcegraphDecorator, ToggleAwardEmoji, ToggleSubscriptionAction
Defined in:
app/controllers/projects/merge_requests_controller.rb

Constant Summary

Constants included from Gitlab::Cache::Helpers

Gitlab::Cache::Helpers::DEFAULT_EXPIRY

Constants included from CookiesHelper

CookiesHelper::COOKIE_TYPE_ENCRYPTED, CookiesHelper::COOKIE_TYPE_PERMANENT

Constants included from SortingTitlesValuesHelper

SortingTitlesValuesHelper::SORT_NAME, SortingTitlesValuesHelper::SORT_UPDATED_OLDEST, SortingTitlesValuesHelper::SORT_UPDATED_RECENT

Instance Method Summary collapse

Methods included from Gitlab::Cache::Helpers

#cache, #render_cached

Methods included from DiffHelper

#apply_diff_view_cookie!, #collapsed_diff_url, #conflicts, #diff_file_blob_raw_path, #diff_file_blob_raw_url, #diff_file_html_data, #diff_file_old_blob_raw_path, #diff_file_old_blob_raw_url, #diff_file_stats_data, #diff_line_content, #diff_link_number, #diff_match_line, #diff_nomappinginraw_line, #diff_options, #diff_view, #diffs_expanded?, #editable_diff?, #inline_diff_btn, #mark_inline_diffs, #parallel_diff_btn, #parallel_diff_discussions, #params_with_whitespace, #render_fork_suggestion, #render_overflow_warning?, #show_only_context_commits?, #submodule_diff_compare_link, #submodule_link

Methods included from RecordUserLastActivity

#set_user_last_activity

Methods included from CookiesHelper

#set_secure_cookie

Methods included from SortingPreference

#default_sort_order, #legacy_sort_cookie_name, #set_sort_order

Methods included from SortingHelper

#admin_groups_sort_options_hash, #admin_users_sort_options, #audit_logs_sort_order_hash, #branches_sort_options_hash, #can_sort_by_issue_weight?, #can_sort_by_merged_date?, #due_date_option, #forks_reverse_sort_options_hash, #forks_sort_direction_button, #forks_sort_options_hash, #groups_sort_options_hash, #issuable_reverse_sort_order_hash, #issuable_sort_direction_button, #issuable_sort_option_overrides, #issuable_sort_option_title, #issuable_sort_options, #label_priority_option, #label_sort_options_hash, #merged_option, #milestones_sort_options_hash, #packages_reverse_sort_order_hash, #packages_sort_direction_button, #packages_sort_option_title, #packages_sort_options_hash, #popularity_option, #projects_sort_options_hash, #relative_position_option, #sort_direction_button, #sort_direction_icon, #sort_options_hash, #starrers_sort_options_hash, #subgroups_sort_options_hash, #tags_sort_options_hash, #title_option, #users_sort_options_hash

Methods included from ButtonHelper

#clipboard_button, #deprecated_clipboard_button, #dropdown_item_with_description, #http_clone_button, #http_dropdown_description, #link_button_to, #ssh_clone_button

Methods included from SortingTitlesValuesHelper

#sort_title_closed_date, #sort_title_closed_earlier, #sort_title_closed_recently, #sort_title_contacted_date, #sort_title_created_date, #sort_title_downvotes, #sort_title_due_date, #sort_title_due_date_later, #sort_title_due_date_soon, #sort_title_expire_date, #sort_title_label_priority, #sort_title_largest_group, #sort_title_largest_repo, #sort_title_latest_activity, #sort_title_merged_date, #sort_title_merged_earlier, #sort_title_merged_recently, #sort_title_milestone, #sort_title_milestone_later, #sort_title_milestone_soon, #sort_title_most_stars, #sort_title_name, #sort_title_name_asc, #sort_title_name_desc, #sort_title_oldest_activity, #sort_title_oldest_created, #sort_title_oldest_last_activity, #sort_title_oldest_signin, #sort_title_oldest_starred, #sort_title_oldest_updated, #sort_title_popularity, #sort_title_priority, #sort_title_recently_created, #sort_title_recently_last_activity, #sort_title_recently_signin, #sort_title_recently_starred, #sort_title_recently_updated, #sort_title_relative_position, #sort_title_size, #sort_title_stars, #sort_title_start_date_later, #sort_title_start_date_soon, #sort_title_title, #sort_title_upvotes, #sort_title_version_asc, #sort_title_version_desc, #sort_value_closed_date, #sort_value_closed_earlier, #sort_value_closed_recently, #sort_value_contacted_date, #sort_value_created_date, #sort_value_downvotes, #sort_value_due_date, #sort_value_due_date_later, #sort_value_due_date_soon, #sort_value_expire_date, #sort_value_label_priority, #sort_value_largest_group, #sort_value_largest_repo, #sort_value_latest_activity, #sort_value_least_popular, #sort_value_merged_date, #sort_value_merged_earlier, #sort_value_merged_recently, #sort_value_milestone, #sort_value_milestone_later, #sort_value_milestone_soon, #sort_value_most_popular, #sort_value_name, #sort_value_name_desc, #sort_value_oldest_activity, #sort_value_oldest_created, #sort_value_oldest_last_activity, #sort_value_oldest_signin, #sort_value_oldest_updated, #sort_value_popularity, #sort_value_priority, #sort_value_recently_created, #sort_value_recently_last_activity, #sort_value_recently_signin, #sort_value_recently_updated, #sort_value_relative_position, #sort_value_size, #sort_value_stars_asc, #sort_value_stars_desc, #sort_value_start_date_later, #sort_value_start_date_soon, #sort_value_title, #sort_value_title_desc, #sort_value_upvotes, #sort_value_version_asc, #sort_value_version_desc

Methods included from ToggleAwardEmoji

#toggle_award_emoji

Methods included from RendersAssignees

#preload_assignees_for_render

Methods included from RendersCommits

#limited_commits, #prepare_commits_for_rendering, #set_commits_for_rendering, #valid_ref?

Methods included from IssuableActions

#bulk_update, #check_destroy_confirmation!, #destroy, #realtime_changes

Methods included from Spam::Concerns::HasSpamActionResponseFields

#spam_action_response_fields

Methods included from SpammableActions::AkismetMarkAsSpamAction

#mark_as_spam

Methods included from ToggleSubscriptionAction

#toggle_subscription

Instance Method Details

#accessibility_reports ⇒ Object 



194
195
196
197
198
199
200
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 194

def accessibility_reports
  if @merge_request.has_accessibility_reports?
    reports_response(@merge_request.compare_accessibility_reports)
  else
    head :no_content
  end
end

#assign_related_issues ⇒ Object 



304
305
306
307
308
309
310
311
312
313
314
315
316
317
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 304

def assign_related_issues
  result = ::MergeRequests::AssignIssuesService
    .new(project: project, current_user: current_user, params: { merge_request: @merge_request })
    .execute

  case result[:count]
  when 0
    flash[:alert] = _("Failed to assign you issues related to the merge request.")
  else
    flash[:notice] = n_("An issue has been assigned to you.", "%d issues have been assigned to you.", result[:count])
  end

  redirect_to(merge_request_path(@merge_request))
end

#cancel_auto_merge ⇒ Object 



278
279
280
281
282
283
284
285
286
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 278

def cancel_auto_merge
  unless @merge_request.can_cancel_auto_merge?(current_user)
    return access_denied!
  end

  AutoMergeService.new(project, current_user).cancel(@merge_request)

  render json: serialize_widget(@merge_request)
end

#ci_environments_status ⇒ Object 



325
326
327
328
329
330
331
332
333
334
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 325

def ci_environments_status
  environments =
    if ci_environments_status_on_merge_result?
      EnvironmentStatus.for_deployed_merge_request(@merge_request, current_user)
    else
      EnvironmentStatus.for_merge_request(@merge_request, current_user)
    end

  render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
end

#codequality_mr_diff_reports ⇒ Object

documented in doc/development/rails_endpoints/index.md



211
212
213
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 211

def codequality_mr_diff_reports
  reports_response(@merge_request.find_codequality_mr_diff_reports, head_pipeline)
end

#codequality_reports ⇒ Object

documented in doc/development/rails_endpoints/index.md



216
217
218
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 216

def codequality_reports
  reports_response(@merge_request.compare_codequality_reports)
end

#commit_change_content ⇒ Object 



274
275
276
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 274

def commit_change_content
  render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
end

#commits ⇒ Object 



118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 118

def commits
  # Get context commits from repository
  @context_commits =
    set_commits_for_rendering(
      @merge_request.recent_context_commits
    )

  per_page = [
    (params[:per_page] || MergeRequestDiff::COMMITS_SAFE_SIZE).to_i,
    MergeRequestDiff::COMMITS_SAFE_SIZE
  ].min
  recent_commits = @merge_request
    .recent_commits(load_from_gitaly: true, limit: per_page, page: params[:page])
    .with_latest_pipeline(@merge_request.source_branch)
    .with_markdown_cache
  @next_page = recent_commits.next_page
  @commits = set_commits_for_rendering(
    recent_commits,
    commits_count: @merge_request.commits_count
  )

  commits_count = if @merge_request.preparing?
                    '-'
                  else
                    @merge_request.commits_count + @merge_request.context_commits_count
                  end

  render json: {
    html: view_to_html_string('projects/merge_requests/_commits'),
    next_page: @next_page,
    count: commits_count
  }
end

#context_commits ⇒ Object 



177
178
179
180
181
182
183
184
185
186
187
188
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 177

def context_commits
  # Get commits from repository
  # or from cache if already merged
  commits = ContextCommitsFinder.new(project, @merge_request, {
                                       search: params[:search],
                                       author: params[:author],
                                       committed_before: convert_date_to_epoch(params[:committed_before]),
                                       committed_after: convert_date_to_epoch(params[:committed_after]),
                                       limit: params[:limit]
                                     }).execute
  render json: CommitEntity.represent(commits, { type: :full, request: merge_request })
end

#coverage_reports ⇒ Object 



202
203
204
205
206
207
208
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 202

def coverage_reports
  if @merge_request.has_coverage_reports?
    reports_response(@merge_request.find_coverage_reports)
  else
    head :no_content
  end
end

#diffs ⇒ Object 



114
115
116
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 114

def diffs
  show_merge_request
end

#discussions ⇒ Object 



345
346
347
348
349
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 345

def discussions
  merge_request.discussions_diffs.load_highlight

  super
end

#edit ⇒ Object 



232
233
234
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 232

def edit
  define_edit_vars
end

#export_csv ⇒ Object 



351
352
353
354
355
356
357
358
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 351

def export_csv
  IssuableExportCsvWorker.perform_async(:merge_request, current_user.id, project.id, finder_options.to_h) # rubocop:disable CodeReuse/Worker

  index_path = project_merge_requests_path(project)
  message = _('Your CSV export has started. It will be emailed to %{email} when complete.') %
    { email: current_user.notification_email_or_default }
  redirect_to(index_path, notice: message)
end

#exposed_artifacts ⇒ Object 



224
225
226
227
228
229
230
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 224

def exposed_artifacts
  if @merge_request.has_exposed_artifacts?
    reports_response(@merge_request.find_exposed_artifacts)
  else
    head :no_content
  end
end

#index ⇒ Object 



101
102
103
104
105
106
107
108
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 101

def index
  @merge_requests = @issuables

  respond_to do |format|
    format.html
    format.atom { render layout: 'xml' }
  end
end

#merge ⇒ Object 



288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 288

def merge
  access_check_result = merge_access_check

  return access_check_result if access_check_result

  status = merge!

  Gitlab::ApplicationContext.push(merge_action_status: status.to_s)

  if @merge_request.merge_error
    render json: { status: status, merge_error: @merge_request.merge_error }
  else
    render json: { status: status }
  end
end

#pipeline_status ⇒ Object 



319
320
321
322
323
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 319

def pipeline_status
  render json: PipelineSerializer
    .new(project: @project, current_user: @current_user)
    .represent_status(head_pipeline)
end

#pipelines ⇒ Object 



152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 152

def pipelines
  set_pipeline_variables
  @pipelines = @pipelines.page(params[:page])

  Gitlab::PollingInterval.set_header(response, interval: 10_000)

  render json: {
    pipelines: PipelineSerializer
      .new(project: @project, current_user: @current_user)
      .with_pagination(request, response)
      .represent(@pipelines, preload: true),
    count: {
      all: @pipelines.count
    }
  }
end

#rebase ⇒ Object 



336
337
338
339
340
341
342
343
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 336

def rebase
  @merge_request
    .rebase_async(current_user.id, skip_ci: Gitlab::Utils.to_boolean(merge_params[:skip_ci], default: false))

  head :ok
rescue MergeRequest::RebaseLockTimeout => e
  render json: { merge_error: e.message }, status: :conflict
end

#remove_wip ⇒ Object 



266
267
268
269
270
271
272
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 266

def remove_wip
  @merge_request = ::MergeRequests::UpdateService
    .new(project: project, current_user: current_user, params: { wip_event: 'ready' })
    .execute(@merge_request)

  render json: serialize_widget(@merge_request)
end

#sast_reports ⇒ Object 



169
170
171
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 169

def sast_reports
  reports_response(merge_request.compare_sast_reports(current_user), head_pipeline)
end

#secret_detection_reports ⇒ Object 



173
174
175
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 173

def secret_detection_reports
  reports_response(merge_request.compare_secret_detection_reports(current_user), head_pipeline)
end

#show ⇒ Object 



110
111
112
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 110

def show
  show_merge_request
end

#terraform_reports ⇒ Object 



220
221
222
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 220

def terraform_reports
  reports_response(@merge_request.find_terraform_reports)
end

#test_reports ⇒ Object 



190
191
192
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 190

def test_reports
  reports_response(@merge_request.compare_test_reports)
end

#update ⇒ Object 



236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
 
# File 'app/controllers/projects/merge_requests_controller.rb', line 236

def update
  @merge_request = ::MergeRequests::UpdateService
    .new(project: project, current_user: current_user, params: merge_request_update_params)
    .execute(@merge_request)

  respond_to do |format|
    format.html do
      if @merge_request.errors.present?
        define_edit_vars

        render :edit
      else
        redirect_to project_merge_request_path(@merge_request.target_project, @merge_request)
      end
    end

    format.json do
      if merge_request.errors.present?
        render json: @merge_request.errors, status: :bad_request
      else
        render json: serializer.represent(@merge_request, serializer: params[:serializer] || 'basic')
      end
    end
  end
rescue ActiveRecord::StaleObjectError
  define_edit_vars if request.format.html?

  render_conflict_response
end