merge_requests_controller.rb 8.5 KB
Newer Older
1 2
require 'gitlab/satellite/satellite'

3
class Projects::MergeRequestsController < Projects::ApplicationController
4
  before_filter :module_enabled
5 6
  before_filter :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status]
  before_filter :closes_issues, only: [:edit, :update, :show, :diffs]
7
  before_filter :validates_merge_request, only: [:show, :diffs]
8
  before_filter :define_show_vars, only: [:show, :diffs]
D
Dmitriy Zaporozhets 已提交
9 10 11 12 13

  # Allow read any merge_request
  before_filter :authorize_read_merge_request!

  # Allow write(create) merge_request
14
  before_filter :authorize_write_merge_request!, only: [:new, :create]
D
Dmitriy Zaporozhets 已提交
15 16

  # Allow modify merge_request
17
  before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
D
Dmitriy Zaporozhets 已提交
18

D
Dmitriy Zaporozhets 已提交
19
  def index
20 21 22 23
    params[:sort] ||= 'newest'
    params[:scope] = 'all' if params[:scope].blank?
    params[:state] = 'opened' if params[:state].blank?

24
    @merge_requests = MergeRequestsFinder.new.execute(current_user, params.merge(project_id: @project.id))
25 26 27
    @merge_requests = @merge_requests.page(params[:page]).per(20)

    @sort = params[:sort].humanize
28 29 30
    assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
    @assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
    @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
31
    @assignees = User.where(id: @project.merge_requests.pluck(:assignee_id))
D
Dmitriy Zaporozhets 已提交
32 33 34
  end

  def show
35 36
    respond_to do |format|
      format.html
I
Izaak Alpert 已提交
37 38
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
39
    end
R
randx 已提交
40 41
  end

42
  def diffs
D
Dmitriy Zaporozhets 已提交
43
    @commit = @merge_request.last_commit
44

45
    @comments_allowed = @reply_allowed = true
I
Izaak Alpert 已提交
46 47
    @comments_target = {noteable_type: 'MergeRequest',
                        noteable_id: @merge_request.id}
48
    @line_notes = @merge_request.notes.where("line_code is not null")
B
Boyan Tabakov 已提交
49 50 51 52

    diff_line_count = Commit::diff_line_count(@merge_request.diffs)
    @suppress_diff = Commit::diff_suppress?(@merge_request.diffs, diff_line_count) && !params[:force_show_diff]
    @force_suppress_diff = Commit::diff_force_suppress?(@merge_request.diffs, diff_line_count)
53 54 55 56 57

    respond_to do |format|
      format.html
      format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
    end
D
Dmitriy Zaporozhets 已提交
58 59 60
  end

  def new
I
Izaak Alpert 已提交
61 62
    @merge_request = MergeRequest.new(params[:merge_request])
    @merge_request.source_project = @project unless @merge_request.source_project
63 64 65
    @merge_request.target_project ||= (@project.forked_from_project || @project)
    @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names
    @merge_request.target_branch ||= @merge_request.target_project.default_branch
I
Izaak Alpert 已提交
66
    @source_project = @merge_request.source_project
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85

    if @merge_request.target_branch && @merge_request.source_branch
      compare_action = Gitlab::Satellite::CompareAction.new(
        current_user,
        @merge_request.target_project,
        @merge_request.target_branch,
        @merge_request.source_project,
        @merge_request.source_branch
      )

      @commits = compare_action.commits
      @commits.map! { |commit| Commit.new(commit) }
      @commit = @commits.first

      @diffs = compare_action.diffs
      @merge_request.title = @merge_request.source_branch.titleize.humanize
      @target_project = @merge_request.target_project
      @target_repo = @target_project.repository
    end
D
Dmitriy Zaporozhets 已提交
86 87 88
  end

  def edit
I
Izaak Alpert 已提交
89 90
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
I
Izaak Alpert 已提交
91
    @target_branches = @merge_request.target_project.repository.branch_names
D
Dmitriy Zaporozhets 已提交
92 93 94
  end

  def create
I
Izaak Alpert 已提交
95
    @target_branches ||= []
96 97 98
    @merge_request = MergeRequests::CreateService.new(project, current_user, params[:merge_request]).execute

    if @merge_request.valid?
99
      redirect_to project_merge_request_path(@merge_request.target_project, @merge_request), notice: 'Merge request was successfully created.'
100
    else
I
Izaak Alpert 已提交
101 102 103
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
104 105 106 107
    end
  end

  def update
108
    @merge_request = MergeRequests::UpdateService.new(project, current_user, params[:merge_request]).execute(@merge_request)
109

110
    if @merge_request.valid?
111 112 113 114 115 116
      respond_to do |format|
        format.js
        format.html do
          redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.'
        end
      end
117
    else
118
      render "edit"
D
Dmitriy Zaporozhets 已提交
119 120 121
    end
  end

V
Valery Sizov 已提交
122
  def automerge_check
123
    if @merge_request.unchecked?
V
Valery Sizov 已提交
124 125
      @merge_request.check_if_can_be_merged
    end
126
    render json: {merge_status: @merge_request.merge_status_name}
V
Valery Sizov 已提交
127 128
  end

R
randx 已提交
129
  def automerge
130 131
    return access_denied! unless allowed_to_merge?

132
    if @merge_request.open? && @merge_request.can_be_merged?
133
      @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
134
      @merge_request.automerge!(current_user, params[:merge_commit_message])
135 136 137 138
      @status = true
    else
      @status = false
    end
R
randx 已提交
139 140
  end

141
  def branch_from
I
Izaak Alpert 已提交
142
    #This is always source
I
Izaak Alpert 已提交
143
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
144
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
145 146 147
  end

  def branch_to
I
Izaak Alpert 已提交
148
    @target_project = selected_target_project
149
    @commit = @target_project.repository.commit(params[:ref]) if params[:ref].present?
150 151
  end

I
Izaak Alpert 已提交
152 153
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
154
    @target_branches = @target_project.repository.branch_names
I
Izaak Alpert 已提交
155
    @target_branches
156 157 158 159

    respond_to do |format|
      format.js
    end
I
Izaak Alpert 已提交
160 161
  end

162
  def ci_status
163
    status = @merge_request.source_project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
I
Izaak Alpert 已提交
164
    response = {status: status}
165 166 167 168

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
169 170
  protected

I
Izaak Alpert 已提交
171
  def selected_target_project
172 173 174 175 176
    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 已提交
177 178
  end

D
Dmitriy Zaporozhets 已提交
179
  def merge_request
S
skv 已提交
180
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
181
  end
D
Dmitriy Zaporozhets 已提交
182

183 184 185 186
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
187
  def authorize_modify_merge_request!
188
    return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
189 190 191
  end

  def authorize_admin_merge_request!
192
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
193
  end
194 195 196 197

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
198 199

  def validates_merge_request
200 201 202
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

203 204 205
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
206 207
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
208

209 210
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
211
    end
212 213 214 215
  end

  def define_show_vars
    # Build a note object for comment form
216
    @note = @project.notes.new(noteable: @merge_request)
217 218
    @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
    @discussions = Note.discussions_from_notes(@notes)
219
    @noteable = @merge_request
220

221
    # Get commits from repository
222 223
    # or from cache if already merged
    @commits = @merge_request.commits
224

D
Dmitriy Zaporozhets 已提交
225
    @merge_request_diff = @merge_request.merge_request_diff
226
    @allowed_to_merge = allowed_to_merge?
227
    @show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
228 229
    @allowed_to_remove_source_branch = allowed_to_remove_source_branch?
    @source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
230 231 232
  end

  def allowed_to_merge?
233
    allowed_to_push_code?(project, @merge_request.target_branch)
234 235 236 237 238 239 240 241
  end

  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

  def allowed_to_remove_source_branch?
242
    allowed_to_push_code?(@merge_request.source_project, @merge_request.source_branch) &&
243
      !@merge_request.disallow_source_branch_removal?
244 245
  end

246 247
  def allowed_to_push_code?(project, branch)
    action = if project.protected_branch?(branch)
248 249 250 251 252
               :push_code_to_protected_branches
             else
               :push_code
             end

253
    can?(current_user, action, project)
254
  end
D
Dmitriy Zaporozhets 已提交
255
end