merge_requests_controller.rb 7.7 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
    sort_param = params[:sort] || 'newest'
    @sort = sort_param.humanize unless sort_param.empty?
22
    @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
23 24 25
    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?
D
Dmitriy Zaporozhets 已提交
26 27 28
  end

  def show
29 30
    respond_to do |format|
      format.html
I
Izaak Alpert 已提交
31 32
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
33
    end
R
randx 已提交
34 35
  end

36
  def diffs
D
Dmitriy Zaporozhets 已提交
37
    @commit = @merge_request.last_commit
38

39
    @comments_allowed = @reply_allowed = true
I
Izaak Alpert 已提交
40 41
    @comments_target = {noteable_type: 'MergeRequest',
                        noteable_id: @merge_request.id}
42
    @line_notes = @merge_request.notes.where("line_code is not null")
B
Boyan Tabakov 已提交
43 44 45 46

    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)
47 48 49 50 51

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

  def new
I
Izaak Alpert 已提交
55 56 57
    @merge_request = MergeRequest.new(params[:merge_request])
    @merge_request.source_project = @project unless @merge_request.source_project
    @merge_request.target_project = @project unless @merge_request.target_project
I
Izaak Alpert 已提交
58
    @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names
I
Izaak Alpert 已提交
59
    @source_project = @merge_request.source_project
I
Izaak Alpert 已提交
60
    @merge_request
D
Dmitriy Zaporozhets 已提交
61 62 63
  end

  def edit
I
Izaak Alpert 已提交
64 65
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
I
Izaak Alpert 已提交
66
    @target_branches = @merge_request.target_project.repository.branch_names
D
Dmitriy Zaporozhets 已提交
67 68 69
  end

  def create
70
    @merge_request = MergeRequest.new(params[:merge_request])
D
Dmitriy Zaporozhets 已提交
71
    @merge_request.author = current_user
I
Izaak Alpert 已提交
72
    @target_branches ||= []
73 74
    if @merge_request.save
      @merge_request.reload_code
I
Izaak Alpert 已提交
75
      redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.'
76
    else
I
Izaak Alpert 已提交
77 78 79
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
80 81 82 83
    end
  end

  def update
D
Dmitriy Zaporozhets 已提交
84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
    # If we close MergeRequest we want to ignore validation
    # so we can close broken one (Ex. fork project removed)
    if params[:merge_request] == {"state_event"=>"close"}
      @merge_request.allow_broken = true

      if @merge_request.close
        opts = { notice: 'Merge request was successfully closed.' }
      else
        opts = { alert: 'Failed to close merge request.' }
      end

      redirect_to [@merge_request.target_project, @merge_request], opts
      return
    end

99 100 101 102 103
    # We dont allow change of source/target projects
    # after merge request was created
    params[:merge_request].delete(:source_project_id)
    params[:merge_request].delete(:target_project_id)

104
    if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
105 106
      @merge_request.reload_code
      @merge_request.mark_as_unchecked
D
Drew Blessing 已提交
107
      @merge_request.reset_events_cache
I
Izaak Alpert 已提交
108
      redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.'
109
    else
110
      render "edit"
D
Dmitriy Zaporozhets 已提交
111 112 113
    end
  end

V
Valery Sizov 已提交
114
  def automerge_check
115
    if @merge_request.unchecked?
V
Valery Sizov 已提交
116 117
      @merge_request.check_if_can_be_merged
    end
118
    render json: {merge_status: @merge_request.merge_status_name}
119
  rescue Gitlab::SatelliteNotExistError
A
Andrew8xx8 已提交
120
    render json: {merge_status: :no_satellite}
V
Valery Sizov 已提交
121 122
  end

R
randx 已提交
123
  def automerge
124 125
    return access_denied! unless allowed_to_merge?

A
Andrew8xx8 已提交
126
    if @merge_request.opened? && @merge_request.can_be_merged?
127
      @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
128
      @merge_request.automerge!(current_user, params[:merge_commit_message])
129 130 131 132
      @status = true
    else
      @status = false
    end
R
randx 已提交
133 134
  end

135
  def branch_from
I
Izaak Alpert 已提交
136
    #This is always source
I
Izaak Alpert 已提交
137
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
138
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
139 140 141
  end

  def branch_to
I
Izaak Alpert 已提交
142
    @target_project = selected_target_project
143
    @commit = @target_project.repository.commit(params[:ref]) if params[:ref].present?
144 145
  end

I
Izaak Alpert 已提交
146 147
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
148
    @target_branches = @target_project.repository.branch_names
I
Izaak Alpert 已提交
149 150 151
    @target_branches
  end

152 153
  def ci_status
    status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
I
Izaak Alpert 已提交
154
    response = {status: status}
155 156 157 158

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
159 160
  protected

I
Izaak Alpert 已提交
161 162 163 164
  def selected_target_project
    ((@project.id.to_s == params[:target_project_id]) || @project.forked_project_link.nil?) ? @project : @project.forked_project_link.forked_from_project
  end

D
Dmitriy Zaporozhets 已提交
165
  def merge_request
166
    @merge_request ||= @project.merge_requests.find_by_iid!(params[:id])
D
Dmitriy Zaporozhets 已提交
167
  end
D
Dmitriy Zaporozhets 已提交
168

169 170 171 172
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
173
  def authorize_modify_merge_request!
174
    return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
175 176 177
  end

  def authorize_admin_merge_request!
178
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
179
  end
180 181 182 183

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
184 185

  def validates_merge_request
186 187 188
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

189 190 191
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
192 193
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
194

195 196
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
197
    end
198 199 200 201
  end

  def define_show_vars
    # Build a note object for comment form
202
    @note = @project.notes.new(noteable: @merge_request)
203 204
    @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
    @discussions = Note.discussions_from_notes(@notes)
205
    @noteable = @merge_request
206

207
    # Get commits from repository
208 209
    # or from cache if already merged
    @commits = @merge_request.commits
210 211 212 213 214 215 216 217 218 219 220 221 222

    @allowed_to_merge = allowed_to_merge?
    @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
  end

  def allowed_to_merge?
    action = if project.protected_branch?(@merge_request.target_branch)
               :push_code_to_protected_branches
             else
               :push_code
             end

    can?(current_user, action, @project)
223
  end
224 225 226 227 228

  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end
D
Dmitriy Zaporozhets 已提交
229
end