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

5
  before_action :module_enabled
6
  before_action :merge_request, only: [
D
Douwe Maan 已提交
7
    :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check,
8
    :ci_status, :cancel_merge_when_build_succeeds
9
  ]
D
Douwe Maan 已提交
10 11 12
  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]
13
  before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
D
Douwe Maan 已提交
14
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds]
D
Dmitriy Zaporozhets 已提交
15 16

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

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

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

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

    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
36

37
    @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
38
    @merge_requests = @merge_requests.preload(:target_project)
39

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

42 43 44 45 46 47 48 49
    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 已提交
50 51 52
  end

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

56 57
    respond_to do |format|
      format.html
58
      format.json { render json: @merge_request }
I
Izaak Alpert 已提交
59 60
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
61
    end
R
randx 已提交
62 63
  end

64
  def diffs
65 66
    apply_diff_view_cookie!

D
Dmitriy Zaporozhets 已提交
67
    @commit = @merge_request.last_commit
68 69 70 71 72
    @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
73

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

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

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

D
Douwe Maan 已提交
94 95 96 97 98 99 100
  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 已提交
101
  def new
D
Dmitriy Zaporozhets 已提交
102 103
    params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
    @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
104
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
105 106 107 108 109 110 111 112 113

    @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 已提交
114
    @commits = @merge_request.compare_commits.reverse
115
    @commit = @merge_request.last_commit
116
    @base_commit = @merge_request.diff_base_commit
J
Jacob Vosmaer 已提交
117
    @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
D
Douwe Maan 已提交
118 119 120 121

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

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

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

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

D
Douwe Maan 已提交
139 140 141 142 143 144
  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 已提交
145
  def update
146
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
147

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

167
  def merge_check
168
    @merge_request.check_if_can_be_merged
169

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

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

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

179
  def merge
180
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
181

Z
Zeger-Jan van de Weg 已提交
182 183 184 185 186
    unless @merge_request.mergeable?
      @status = :failed
      return
    end

187
    TodoService.new.merge_merge_request(merge_request, current_user)
188

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

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

201
  def branch_from
I
Izaak Alpert 已提交
202
    #This is always source
I
Izaak Alpert 已提交
203
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
204
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
205 206 207
  end

  def branch_to
I
Izaak Alpert 已提交
208
    @target_project = selected_target_project
209
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
210 211
  end

I
Izaak Alpert 已提交
212 213
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
214
    @target_branches = @target_project.repository.branch_names
215 216 217 218

    respond_to do |format|
      format.js
    end
I
Izaak Alpert 已提交
219 220
  end

221 222 223 224 225 226 227 228
  def st
    @ci_commit = @merge_request.ci_commit
    @statuses = @ci_commit.statuses if @ci_commit
    render json: {
      statuses: @statuses
    }
  end

229
  def ci_status
230
    ci_service = @merge_request.source_project.ci_service
V
Valery Sizov 已提交
231
    status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch)
232 233

    if ci_service.respond_to?(:commit_coverage)
V
Valery Sizov 已提交
234
      coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
235 236 237 238
    end

    response = {
      status: status,
239
      coverage: coverage
240
    }
241 242 243 244

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
245 246
  protected

I
Izaak Alpert 已提交
247
  def selected_target_project
248 249 250 251 252
    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 已提交
253 254
  end

D
Dmitriy Zaporozhets 已提交
255
  def merge_request
S
skv 已提交
256
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
257
  end
258
  alias_method :subscribable_resource, :merge_request
D
Dmitriy Zaporozhets 已提交
259

260 261 262 263
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
264
  def authorize_update_merge_request!
265
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
266 267 268
  end

  def authorize_admin_merge_request!
269
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
270
  end
271 272 273 274

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
275 276

  def validates_merge_request
277 278 279
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

280 281 282
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
283 284
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
285

286 287
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
288
    end
289 290 291 292
  end

  def define_show_vars
    # Build a note object for comment form
293
    @note = @project.notes.new(noteable: @merge_request)
V
Valery Sizov 已提交
294
    @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
295
    @discussions = Note.discussions_from_notes(@notes)
296
    @noteable = @merge_request
297

298
    # Get commits from repository
299 300
    # or from cache if already merged
    @commits = @merge_request.commits
301

D
Dmitriy Zaporozhets 已提交
302
    @merge_request_diff = @merge_request.merge_request_diff
303

D
Douwe Maan 已提交
304
    @ci_commit = @merge_request.ci_commit
D
Douwe Maan 已提交
305
    @statuses = @ci_commit.statuses if @ci_commit
D
Douwe Maan 已提交
306

307 308 309 310
    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
311 312
  end

313 314
  def define_widget_vars
    @ci_commit = @merge_request.ci_commit
315
    closes_issues
316 317
  end

318 319 320 321 322
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

323
  def merge_request_params
324
    params.require(:merge_request).permit(
325 326
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
327
      :state_event, :description, :task_num, label_ids: []
328 329
    )
  end
330

Z
Zeger-Jan van de Weg 已提交
331 332 333 334
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

335 336 337 338 339
  # 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 已提交
340
end