merge_requests_controller.rb 10.0 KB
Newer Older
1
class Projects::MergeRequestsController < Projects::ApplicationController
2
  before_action :module_enabled
3
  before_action :merge_request, only: [
D
Douwe Maan 已提交
4
    :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check,
Z
Zeger-Jan van de Weg 已提交
5
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds
6
  ]
D
Douwe Maan 已提交
7 8 9
  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]
10
  before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
D
Douwe Maan 已提交
11
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds]
D
Dmitriy Zaporozhets 已提交
12 13

  # Allow read any merge_request
14
  before_action :authorize_read_merge_request!
D
Dmitriy Zaporozhets 已提交
15 16

  # Allow write(create) merge_request
D
Dmitriy Zaporozhets 已提交
17
  before_action :authorize_create_merge_request!, only: [:new, :create]
D
Dmitriy Zaporozhets 已提交
18 19

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

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

    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
33

34
    @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
35
    @merge_requests = @merge_requests.preload(:target_project)
36

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

39 40 41 42 43 44 45 46
    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 已提交
47 48 49
  end

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

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

61
  def diffs
62 63
    apply_diff_view_cookie!

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

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

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

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

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

    @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 已提交
111
    @commits = @merge_request.compare_commits.reverse
112
    @commit = @merge_request.last_commit
113
    @base_commit = @merge_request.diff_base_commit
D
Dmitriy Zaporozhets 已提交
114
    @diffs = @merge_request.compare_diffs
D
Douwe Maan 已提交
115 116 117 118

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

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

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

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

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

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

164
  def merge_check
165
    @merge_request.check_if_can_be_merged
166

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

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

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

176
  def merge
177
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
178

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

    @merge_request.update(merge_error: nil)

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

196
  def branch_from
I
Izaak Alpert 已提交
197
    #This is always source
I
Izaak Alpert 已提交
198
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
199
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
200 201 202
  end

  def branch_to
I
Izaak Alpert 已提交
203
    @target_project = selected_target_project
204
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
205 206
  end

I
Izaak Alpert 已提交
207 208
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
209
    @target_branches = @target_project.repository.branch_names
210 211 212 213

    respond_to do |format|
      format.js
    end
I
Izaak Alpert 已提交
214 215
  end

216
  def ci_status
217
    ci_service = @merge_request.source_project.ci_service
V
Valery Sizov 已提交
218
    status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch)
219 220

    if ci_service.respond_to?(:commit_coverage)
V
Valery Sizov 已提交
221
      coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
222 223 224 225 226 227
    end

    response = {
      status: status,
      coverage: coverage
    }
228 229 230 231

    render json: response
  end

V
tests  
Valery Sizov 已提交
232 233
  def toggle_subscription
    @merge_request.toggle_subscription(current_user)
234

V
Valery Sizov 已提交
235 236 237
    render nothing: true
  end

D
Dmitriy Zaporozhets 已提交
238 239
  protected

I
Izaak Alpert 已提交
240
  def selected_target_project
241 242 243 244 245
    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 已提交
246 247
  end

D
Dmitriy Zaporozhets 已提交
248
  def merge_request
S
skv 已提交
249
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
250
  end
D
Dmitriy Zaporozhets 已提交
251

252 253 254 255
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
256
  def authorize_update_merge_request!
257
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
258 259 260
  end

  def authorize_admin_merge_request!
261
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
262
  end
263 264 265 266

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
267 268

  def validates_merge_request
269 270 271
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

272 273 274
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
275 276
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
277

278 279
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
280
    end
281 282 283 284
  end

  def define_show_vars
    # Build a note object for comment form
285
    @note = @project.notes.new(noteable: @merge_request)
V
Valery Sizov 已提交
286
    @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
287
    @discussions = Note.discussions_from_notes(@notes)
288
    @noteable = @merge_request
289

290
    # Get commits from repository
291 292
    # or from cache if already merged
    @commits = @merge_request.commits
293

D
Dmitriy Zaporozhets 已提交
294
    @merge_request_diff = @merge_request.merge_request_diff
295

D
Douwe Maan 已提交
296
    @ci_commit = @merge_request.ci_commit
D
Douwe Maan 已提交
297
    @statuses = @ci_commit.statuses if @ci_commit
D
Douwe Maan 已提交
298

299 300 301 302
    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
303 304
  end

305 306
  def define_widget_vars
    @ci_commit = @merge_request.ci_commit
307
    closes_issues
308 309
  end

310 311 312 313 314
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

315
  def merge_request_params
316
    params.require(:merge_request).permit(
317 318
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
319
      :state_event, :description, :task_num, label_ids: []
320 321
    )
  end
322

Z
Zeger-Jan van de Weg 已提交
323 324 325 326
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

327 328 329 330 331
  # 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 已提交
332
end