merge_requests_controller.rb 10.8 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

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

43 44 45 46
    respond_to do |format|
      format.html
      format.json do
        render json: {
47
          html: view_to_html_string("projects/merge_requests/_merge_requests"),
P
Phil Hughes 已提交
48
          labels: @labels.as_json(methods: :text_color)
49 50 51
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
52 53 54
  end

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

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

66
  def diffs
67 68
    apply_diff_view_cookie!

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

76 77 78 79
    @comments_target = {
      noteable_type: 'MergeRequest',
      noteable_id: @merge_request.id
    }
D
Douwe Maan 已提交
80 81

    @grouped_diff_notes = @merge_request.notes.grouped_diff_notes
B
Boyan Tabakov 已提交
82

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

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

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

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

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

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

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

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

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

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

166 167 168 169 170 171 172
  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

173
  def merge_check
174
    @merge_request.check_if_can_be_merged
175

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

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

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

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

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

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

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

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

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

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

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

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

227
  def ci_status
228 229
    ci_commit = @merge_request.ci_commit
    if ci_commit
P
Phil Hughes 已提交
230
      status = ci_commit.status
231 232 233 234
      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
235

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

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

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

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
253 254
  protected

I
Izaak Alpert 已提交
255
  def selected_target_project
256 257 258 259 260
    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 已提交
261 262
  end

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

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

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

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

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

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

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

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

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

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

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

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

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

322 323
  def define_widget_vars
    @ci_commit = @merge_request.ci_commit
K
Kamil Trzcinski 已提交
324
    @ci_commits = [@ci_commit].compact
325
    closes_issues
326 327
  end

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

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

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

345 346 347 348 349
  # 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 已提交
350
end