merge_requests_controller.rb 10.7 KB
Newer Older
1
class Projects::MergeRequestsController < Projects::ApplicationController
2
  include ToggleSubscriptionAction
J
Jacob Vosmaer 已提交
3
  include DiffHelper
4
  include IssuableActions
J
Jacob Vosmaer 已提交
5

6
  before_action :module_enabled
7
  before_action :merge_request, only: [
8
    :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check,
9
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip
10
  ]
D
Douwe Maan 已提交
11 12 13
  before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits, :builds]
  before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds]
  before_action :define_show_vars, only: [:show, :diffs, :commits, :builds]
14
  before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
D
Douwe Maan 已提交
15
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds]
D
Dmitriy Zaporozhets 已提交
16 17

  # Allow read any merge_request
18
  before_action :authorize_read_merge_request!
D
Dmitriy Zaporozhets 已提交
19 20

  # Allow write(create) merge_request
D
Dmitriy Zaporozhets 已提交
21
  before_action :authorize_create_merge_request!, only: [:new, :create]
D
Dmitriy Zaporozhets 已提交
22 23

  # Allow modify merge_request
24
  before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort]
D
Dmitriy Zaporozhets 已提交
25

D
Dmitriy Zaporozhets 已提交
26
  def index
27
    terms = params['issue_search']
D
Dmitriy Zaporozhets 已提交
28
    @merge_requests = get_merge_requests_collection
29 30 31 32 33 34 35 36

    if terms.present?
      if terms =~ /\A[#!](\d+)\z/
        @merge_requests = @merge_requests.where(iid: $1)
      else
        @merge_requests = @merge_requests.full_search(terms)
      end
    end
37

38
    @merge_requests = @merge_requests.page(params[:page])
39
    @merge_requests = @merge_requests.preload(:target_project)
40

T
Tap 已提交
41 42
    @label = @project.labels.find_by(title: params[:label_name])

43 44 45 46 47 48 49 50
    respond_to do |format|
      format.html
      format.json do
        render json: {
          html: view_to_html_string("projects/merge_requests/_merge_requests")
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
51 52 53
  end

  def show
S
skv 已提交
54
    @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
55
      group(:commit_id).count
56

57 58
    respond_to do |format|
      format.html
59
      format.json { render json: @merge_request }
60 61
      format.diff { render text: @merge_request.to_diff }
      format.patch { render text: @merge_request.to_patch }
62
    end
R
randx 已提交
63 64
  end

65
  def diffs
66 67
    apply_diff_view_cookie!

D
Dmitriy Zaporozhets 已提交
68
    @commit = @merge_request.last_commit
69 70 71 72 73
    @base_commit = @merge_request.diff_base_commit

    # MRs created before 8.4 don't have a diff_base_commit,
    # but we need it for the "View file @ ..." link by deleted files
    @base_commit ||= @merge_request.first_commit.parent || @merge_request.first_commit
74

75
    @comments_allowed = @reply_allowed = true
76 77 78 79
    @comments_target = {
      noteable_type: 'MergeRequest',
      noteable_id: @merge_request.id
    }
80
    @line_notes = @merge_request.notes.where("line_code is not null")
B
Boyan Tabakov 已提交
81

82 83 84 85
    respond_to do |format|
      format.html
      format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
    end
D
Dmitriy Zaporozhets 已提交
86 87
  end

88
  def commits
89 90 91 92
    respond_to do |format|
      format.html { render 'show' }
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_commits') } }
    end
93 94
  end

D
Douwe Maan 已提交
95 96 97 98 99 100 101
  def builds
    respond_to do |format|
      format.html { render 'show' }
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
102
  def new
D
Dmitriy Zaporozhets 已提交
103 104
    params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
    @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
105
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
106 107 108 109 110 111 112 113 114

    @target_branches = if @merge_request.target_project
                         @merge_request.target_project.repository.branch_names
                       else
                         []
                       end

    @target_project = merge_request.target_project
    @source_project = merge_request.source_project
D
Douwe Maan 已提交
115
    @commits = @merge_request.compare_commits.reverse
116
    @commit = @merge_request.last_commit
117
    @base_commit = @merge_request.diff_base_commit
J
Jacob Vosmaer 已提交
118
    @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
D
Douwe Maan 已提交
119 120 121 122

    @ci_commit = @merge_request.ci_commit
    @statuses = @ci_commit.statuses if @ci_commit

D
Dmitriy Zaporozhets 已提交
123 124
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
125 126 127
  end

  def create
I
Izaak Alpert 已提交
128
    @target_branches ||= []
129
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
130 131

    if @merge_request.valid?
132
      redirect_to(merge_request_path(@merge_request))
133
    else
I
Izaak Alpert 已提交
134 135 136
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
137 138 139
    end
  end

D
Douwe Maan 已提交
140 141 142 143 144 145
  def edit
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
    @target_branches = @merge_request.target_project.repository.branch_names
  end

D
Dmitriy Zaporozhets 已提交
146
  def update
147
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
148

149
    if @merge_request.valid?
150 151 152
      respond_to do |format|
        format.js
        format.html do
V
Vinnie Okada 已提交
153
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
154
                       @merge_request.target_project, @merge_request])
155
        end
156
        format.json do
157
          render json: @merge_request.to_json(include: [:milestone, :labels, assignee: { methods: :avatar_url }])
158
        end
159
      end
160
    else
161
      render "edit"
D
Dmitriy Zaporozhets 已提交
162 163 164
    end
  end

165 166 167 168 169 170 171
  def remove_wip
    MergeRequests::UpdateService.new(project, current_user, title: @merge_request.wipless_title).execute(@merge_request)

    redirect_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request),
      notice: "The merge request can now be merged."
  end

172
  def merge_check
173
    @merge_request.check_if_can_be_merged
174

D
Dmitriy Zaporozhets 已提交
175
    render partial: "projects/merge_requests/widget/show.html.haml", layout: false
V
Valery Sizov 已提交
176 177
  end

Z
Zeger-Jan van de Weg 已提交
178
  def cancel_merge_when_build_succeeds
179
    return access_denied! unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
Z
Zeger-Jan van de Weg 已提交
180

181
    MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user).cancel(@merge_request)
Z
Zeger-Jan van de Weg 已提交
182 183
  end

184
  def merge
185
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
186

Z
Zeger-Jan van de Weg 已提交
187 188 189 190 191
    unless @merge_request.mergeable?
      @status = :failed
      return
    end

192
    TodoService.new.merge_merge_request(merge_request, current_user)
193

Z
Zeger-Jan van de Weg 已提交
194 195
    @merge_request.update(merge_error: nil)

D
Douwe Maan 已提交
196
    if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit && @merge_request.ci_commit.active?
197
      MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
Z
Zeger-Jan van de Weg 已提交
198 199
                                                      .execute(@merge_request)
      @status = :merge_when_build_succeeds
200
    else
Z
Zeger-Jan van de Weg 已提交
201 202
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
203
    end
R
randx 已提交
204 205
  end

206
  def branch_from
I
Izaak Alpert 已提交
207
    #This is always source
I
Izaak Alpert 已提交
208
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
209
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
210
    render layout: false
211 212 213
  end

  def branch_to
I
Izaak Alpert 已提交
214
    @target_project = selected_target_project
215
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
216
    render layout: false
217 218
  end

I
Izaak Alpert 已提交
219 220
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
221
    @target_branches = @target_project.repository.branch_names
222

P
Phil Hughes 已提交
223
    render layout: false
I
Izaak Alpert 已提交
224 225
  end

226
  def ci_status
227 228
    ci_commit = @merge_request.ci_commit
    if ci_commit
P
Phil Hughes 已提交
229
      status = ci_commit.status
230 231 232 233
      coverage = ci_commit.try(:coverage)
    else
      ci_service = @merge_request.source_project.ci_service
      status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch) if ci_service
234

235 236 237
      if ci_service.respond_to?(:commit_coverage)
        coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
      end
238 239
    end

P
Phil Hughes 已提交
240
    status = "preparing" if status.nil?
P
Phil Hughes 已提交
241

242
    response = {
243 244
      title: merge_request.title,
      sha: merge_request.last_commit_short_sha,
245 246 247
      status: status,
      coverage: coverage
    }
248 249 250 251

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
252 253
  protected

I
Izaak Alpert 已提交
254
  def selected_target_project
255 256 257 258 259
    if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil?
      @project
    else
      @project.forked_project_link.forked_from_project
    end
I
Izaak Alpert 已提交
260 261
  end

D
Dmitriy Zaporozhets 已提交
262
  def merge_request
S
skv 已提交
263
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
264
  end
265
  alias_method :subscribable_resource, :merge_request
266
  alias_method :issuable, :merge_request
D
Dmitriy Zaporozhets 已提交
267

268 269 270 271
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
272
  def authorize_update_merge_request!
273
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
274 275 276
  end

  def authorize_admin_merge_request!
277
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
278
  end
279 280 281 282

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
283 284

  def validates_merge_request
285 286 287
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

288 289 290
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
291 292
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
293

294 295
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
296
    end
297 298 299 300
  end

  def define_show_vars
    # Build a note object for comment form
301
    @note = @project.notes.new(noteable: @merge_request)
V
Valery Sizov 已提交
302
    @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
303
    @discussions = Note.discussions_from_notes(@notes)
304
    @noteable = @merge_request
305

306
    # Get commits from repository
307 308
    # or from cache if already merged
    @commits = @merge_request.commits
309

D
Dmitriy Zaporozhets 已提交
310
    @merge_request_diff = @merge_request.merge_request_diff
311

D
Douwe Maan 已提交
312
    @ci_commit = @merge_request.ci_commit
D
Douwe Maan 已提交
313
    @statuses = @ci_commit.statuses if @ci_commit
D
Douwe Maan 已提交
314

315 316 317 318
    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
319 320
  end

321 322
  def define_widget_vars
    @ci_commit = @merge_request.ci_commit
323
    closes_issues
324 325
  end

326 327 328 329 330
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

331
  def merge_request_params
332
    params.require(:merge_request).permit(
333 334
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
335
      :state_event, :description, :task_num, label_ids: []
336 337
    )
  end
338

Z
Zeger-Jan van de Weg 已提交
339 340 341 342
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

343 344 345 346 347
  # Make sure merge requests created before 8.0
  # have head file in refs/merge-requests/
  def ensure_ref_fetched
    @merge_request.ensure_ref_fetched
  end
D
Dmitriy Zaporozhets 已提交
348
end