merge_requests_controller.rb 7.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 66 67
    @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 已提交
68
    @source_project = @merge_request.source_project
I
Izaak Alpert 已提交
69
    @merge_request
D
Dmitriy Zaporozhets 已提交
70 71 72
  end

  def edit
I
Izaak Alpert 已提交
73 74
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
I
Izaak Alpert 已提交
75
    @target_branches = @merge_request.target_project.repository.branch_names
D
Dmitriy Zaporozhets 已提交
76 77 78
  end

  def create
I
Izaak Alpert 已提交
79
    @target_branches ||= []
80 81 82
    @merge_request = MergeRequests::CreateService.new(project, current_user, params[:merge_request]).execute

    if @merge_request.valid?
I
Izaak Alpert 已提交
83
      redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.'
84
    else
I
Izaak Alpert 已提交
85 86 87
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
88 89 90 91
    end
  end

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

94
    if @merge_request.valid?
95 96 97 98 99 100
      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
101
    else
102
      render "edit"
D
Dmitriy Zaporozhets 已提交
103 104 105
    end
  end

V
Valery Sizov 已提交
106
  def automerge_check
107
    if @merge_request.unchecked?
V
Valery Sizov 已提交
108 109
      @merge_request.check_if_can_be_merged
    end
110
    render json: {merge_status: @merge_request.merge_status_name}
111
  rescue Gitlab::SatelliteNotExistError
A
Andrew8xx8 已提交
112
    render json: {merge_status: :no_satellite}
V
Valery Sizov 已提交
113 114
  end

R
randx 已提交
115
  def automerge
116 117
    return access_denied! unless allowed_to_merge?

118
    if @merge_request.open? && @merge_request.can_be_merged?
119
      @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
120
      @merge_request.automerge!(current_user, params[:merge_commit_message])
121 122 123 124
      @status = true
    else
      @status = false
    end
R
randx 已提交
125 126
  end

127
  def branch_from
I
Izaak Alpert 已提交
128
    #This is always source
I
Izaak Alpert 已提交
129
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
130
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
131 132 133
  end

  def branch_to
I
Izaak Alpert 已提交
134
    @target_project = selected_target_project
135
    @commit = @target_project.repository.commit(params[:ref]) if params[:ref].present?
136 137
  end

I
Izaak Alpert 已提交
138 139
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
140
    @target_branches = @target_project.repository.branch_names
I
Izaak Alpert 已提交
141
    @target_branches
142 143 144 145

    respond_to do |format|
      format.js
    end
I
Izaak Alpert 已提交
146 147
  end

148
  def ci_status
149
    status = @merge_request.source_project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
I
Izaak Alpert 已提交
150
    response = {status: status}
151 152 153 154

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
155 156
  protected

I
Izaak Alpert 已提交
157
  def selected_target_project
158 159 160 161 162
    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 已提交
163 164
  end

D
Dmitriy Zaporozhets 已提交
165
  def merge_request
S
skv 已提交
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

D
Dmitriy Zaporozhets 已提交
211
    @merge_request_diff = @merge_request.merge_request_diff
212
    @allowed_to_merge = allowed_to_merge?
213
    @show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
214 215 216 217 218 219 220 221 222 223
  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)
224
  end
225 226 227 228 229

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