merge_requests_controller.rb 8.4 KB
Newer Older
1
class Projects::MergeRequestsController < Projects::ApplicationController
2
  before_action :module_enabled
3
  before_action :merge_request, only: [
4
    :edit, :update, :show, :diffs, :commits, :merge, :merge_check,
5 6 7 8 9
    :ci_status, :toggle_subscription
  ]
  before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits]
  before_action :validates_merge_request, only: [:show, :diffs, :commits]
  before_action :define_show_vars, only: [:show, :diffs, :commits]
10
  before_action :ensure_ref_fetched, only: [:show, :commits, :diffs]
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
11 12

  # Allow read any merge_request
13
  before_action :authorize_read_merge_request!
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
14 15

  # Allow write(create) merge_request
16
  before_action :authorize_create_merge_request!, only: [:new, :create]
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
17 18

  # Allow modify merge_request
19
  before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :sort]
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
20

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
21
  def index
22
    terms = params['issue_search']
23
    @merge_requests = get_merge_requests_collection
24 25 26 27 28 29 30 31

    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
32

33
    @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
34 35 36 37 38 39 40 41 42

    respond_to do |format|
      format.html
      format.json do
        render json: {
          html: view_to_html_string("projects/merge_requests/_merge_requests")
        }
      end
    end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
43 44 45
  end

  def show
46
    @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
47
      group(:commit_id).count
48

49 50
    respond_to do |format|
      format.html
51
      format.json { render json: @merge_request }
52 53
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
54
    end
randx's avatar
randx committed
55 56
  end

57
  def diffs
58
    @commit = @merge_request.last_commit
59 60
    @first_commit = @merge_request.first_commit

61
    @comments_allowed = @reply_allowed = true
62 63 64 65
    @comments_target = {
      noteable_type: 'MergeRequest',
      noteable_id: @merge_request.id
    }
66
    @line_notes = @merge_request.notes.where("line_code is not null")
67

68 69 70 71
    respond_to do |format|
      format.html
      format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
    end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
72 73
  end

74
  def commits
75 76 77 78
    respond_to do |format|
      format.html { render 'show' }
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_commits') } }
    end
79 80
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
81
  def new
82 83 84 85 86 87 88 89 90 91 92 93
    params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
    @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute

    @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
    @commits = @merge_request.compare_commits
94 95
    @commit = @merge_request.last_commit
    @first_commit = @merge_request.first_commit
96 97 98
    @diffs = @merge_request.compare_diffs
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
99 100 101
  end

  def edit
Izaak Alpert's avatar
Izaak Alpert committed
102 103
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
104
    @target_branches = @merge_request.target_project.repository.branch_names
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
105 106 107
  end

  def create
108
    @target_branches ||= []
109
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
110 111

    if @merge_request.valid?
112
      redirect_to(merge_request_path(@merge_request))
113
    else
Izaak Alpert's avatar
Izaak Alpert committed
114 115 116
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
117 118 119 120
    end
  end

  def update
121
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
122

123
    if @merge_request.valid?
124 125 126
      respond_to do |format|
        format.js
        format.html do
Vinnie Okada's avatar
Vinnie Okada committed
127
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
128
                       @merge_request.target_project, @merge_request])
129
        end
130 131 132 133 134 135
        format.json do
          render json: {
            saved: @merge_request.valid?,
            assignee_avatar_url: @merge_request.assignee.try(:avatar_url)
          }
        end
136
      end
137
    else
138
      render "edit"
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
139 140 141
    end
  end

142
  def merge_check
143
    if @merge_request.unchecked?
Valery Sizov's avatar
Valery Sizov committed
144 145
      @merge_request.check_if_can_be_merged
    end
146

147 148
    closes_issues

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
149
    render partial: "projects/merge_requests/widget/show.html.haml", layout: false
Valery Sizov's avatar
Valery Sizov committed
150 151
  end

152
  def merge
153
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
154

155
    if @merge_request.mergeable?
156
      @merge_request.update(merge_error: nil)
157
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
158 159 160 161
      @status = true
    else
      @status = false
    end
randx's avatar
randx committed
162 163
  end

164
  def branch_from
165
    #This is always source
Izaak Alpert's avatar
Izaak Alpert committed
166
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
167
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
168 169 170
  end

  def branch_to
171
    @target_project = selected_target_project
172
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
173 174
  end

175 176
  def update_branches
    @target_project = selected_target_project
Izaak Alpert's avatar
Izaak Alpert committed
177
    @target_branches = @target_project.repository.branch_names
178 179 180 181

    respond_to do |format|
      format.js
    end
182 183
  end

184
  def ci_status
185
    ci_service = @merge_request.source_project.ci_service
Valery Sizov's avatar
Valery Sizov committed
186
    status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch)
187 188

    if ci_service.respond_to?(:commit_coverage)
Valery Sizov's avatar
Valery Sizov committed
189
      coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
190 191 192 193 194 195
    end

    response = {
      status: status,
      coverage: coverage
    }
196 197 198 199

    render json: response
  end

Valery Sizov's avatar
tests  
Valery Sizov committed
200 201
  def toggle_subscription
    @merge_request.toggle_subscription(current_user)
202

Valery Sizov's avatar
Valery Sizov committed
203 204 205
    render nothing: true
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
206 207
  protected

208
  def selected_target_project
209 210 211 212 213
    if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil?
      @project
    else
      @project.forked_project_link.forked_from_project
    end
214 215
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
216
  def merge_request
skv's avatar
skv committed
217
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
218
  end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
219

220 221 222 223
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

224
  def authorize_update_merge_request!
225
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
226 227 228
  end

  def authorize_admin_merge_request!
229
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
230
  end
231 232 233 234

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
235 236

  def validates_merge_request
237 238 239
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

240 241 242
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
243 244
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
245

246 247
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
248
    end
249 250 251
  end

  def define_show_vars
252
    @participants = @merge_request.participants(current_user)
253

254
    # Build a note object for comment form
255
    @note = @project.notes.new(noteable: @merge_request)
256 257
    @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
    @discussions = Note.discussions_from_notes(@notes)
258
    @noteable = @merge_request
259

260
    # Get commits from repository
261 262
    # or from cache if already merged
    @commits = @merge_request.commits
263

264
    @merge_request_diff = @merge_request.merge_request_diff
265

266 267 268 269
    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
270 271
  end

272 273 274 275 276
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

277 278 279 280
  def merge_request_params
    params.require(:merge_request).permit(
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
281
      :state_event, :description, :task_num, label_ids: []
282 283
    )
  end
284 285 286 287 288 289

  # 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
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
290
end