merge_requests_controller.rb 8.3 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]
D
Dmitriy Zaporozhets 已提交
11 12

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

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

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

D
Dmitriy Zaporozhets 已提交
21
  def index
22
    terms = params['issue_search']
D
Dmitriy Zaporozhets 已提交
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
D
Dmitriy Zaporozhets 已提交
43 44 45
  end

  def show
S
skv 已提交
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 }
I
Izaak Alpert 已提交
52 53
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
54
    end
R
randx 已提交
55 56
  end

57
  def diffs
D
Dmitriy Zaporozhets 已提交
58
    @commit = @merge_request.last_commit
59
    @comments_allowed = @reply_allowed = true
60 61 62 63
    @comments_target = {
      noteable_type: 'MergeRequest',
      noteable_id: @merge_request.id
    }
64
    @line_notes = @merge_request.notes.where("line_code is not null")
B
Boyan Tabakov 已提交
65

66 67 68 69
    respond_to do |format|
      format.html
      format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
    end
D
Dmitriy Zaporozhets 已提交
70 71
  end

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

D
Dmitriy Zaporozhets 已提交
79
  def new
D
Dmitriy Zaporozhets 已提交
80 81 82 83 84 85 86 87 88 89 90 91
    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
D
Dmitriy Zaporozhets 已提交
92
    @commit = @merge_request.compare_commits.last
D
Dmitriy Zaporozhets 已提交
93 94 95
    @diffs = @merge_request.compare_diffs
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
96 97 98
  end

  def edit
I
Izaak Alpert 已提交
99 100
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
I
Izaak Alpert 已提交
101
    @target_branches = @merge_request.target_project.repository.branch_names
D
Dmitriy Zaporozhets 已提交
102 103 104
  end

  def create
I
Izaak Alpert 已提交
105
    @target_branches ||= []
106
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
107 108

    if @merge_request.valid?
109
      redirect_to(merge_request_path(@merge_request))
110
    else
I
Izaak Alpert 已提交
111 112 113
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
114 115 116 117
    end
  end

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

120
    if @merge_request.valid?
121 122 123
      respond_to do |format|
        format.js
        format.html do
V
Vinnie Okada 已提交
124
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
125
                       @merge_request.target_project, @merge_request])
126
        end
127 128 129 130 131 132
        format.json do
          render json: {
            saved: @merge_request.valid?,
            assignee_avatar_url: @merge_request.assignee.try(:avatar_url)
          }
        end
133
      end
134
    else
135
      render "edit"
D
Dmitriy Zaporozhets 已提交
136 137 138
    end
  end

139
  def merge_check
140
    if @merge_request.unchecked?
V
Valery Sizov 已提交
141 142
      @merge_request.check_if_can_be_merged
    end
143

144 145
    closes_issues

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

149
  def merge
150
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
151

152
    if @merge_request.mergeable?
153
      @merge_request.update(merge_error: nil)
154
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
155 156 157 158
      @status = true
    else
      @status = false
    end
R
randx 已提交
159 160
  end

161
  def branch_from
I
Izaak Alpert 已提交
162
    #This is always source
I
Izaak Alpert 已提交
163
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
164
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
165 166 167
  end

  def branch_to
I
Izaak Alpert 已提交
168
    @target_project = selected_target_project
169
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
170 171
  end

I
Izaak Alpert 已提交
172 173
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
174
    @target_branches = @target_project.repository.branch_names
175 176 177 178

    respond_to do |format|
      format.js
    end
I
Izaak Alpert 已提交
179 180
  end

181
  def ci_status
182
    ci_service = @merge_request.source_project.ci_service
V
Valery Sizov 已提交
183
    status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch)
184 185

    if ci_service.respond_to?(:commit_coverage)
V
Valery Sizov 已提交
186
      coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
187 188 189 190 191 192
    end

    response = {
      status: status,
      coverage: coverage
    }
193 194 195 196

    render json: response
  end

V
tests  
Valery Sizov 已提交
197 198
  def toggle_subscription
    @merge_request.toggle_subscription(current_user)
199

V
Valery Sizov 已提交
200 201 202
    render nothing: true
  end

D
Dmitriy Zaporozhets 已提交
203 204
  protected

I
Izaak Alpert 已提交
205
  def selected_target_project
206 207 208 209 210
    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 已提交
211 212
  end

D
Dmitriy Zaporozhets 已提交
213
  def merge_request
S
skv 已提交
214
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
215
  end
D
Dmitriy Zaporozhets 已提交
216

217 218 219 220
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
221
  def authorize_update_merge_request!
222
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
223 224 225
  end

  def authorize_admin_merge_request!
226
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
227
  end
228 229 230 231

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
232 233

  def validates_merge_request
234 235 236
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

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

243 244
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
245
    end
246 247 248
  end

  def define_show_vars
249
    @participants = @merge_request.participants(current_user)
250

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

257
    # Get commits from repository
258 259
    # or from cache if already merged
    @commits = @merge_request.commits
260

D
Dmitriy Zaporozhets 已提交
261
    @merge_request_diff = @merge_request.merge_request_diff
262
    
263 264 265 266
    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
267 268
  end

269 270 271 272 273
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

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

  # 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 已提交
287
end