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

3
class Projects::MergeRequestsController < Projects::ApplicationController
4
  before_filter :module_enabled
V
tests  
Valery Sizov 已提交
5
  before_filter :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status, :toggle_subscription]
6
  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
    terms = params['issue_search']
D
Dmitriy Zaporozhets 已提交
21
    @merge_requests = get_merge_requests_collection
22
    @merge_requests = @merge_requests.full_search(terms) if terms.present?
23
    @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
24 25 26 27 28 29 30 31 32

    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 已提交
33 34 35
  end

  def show
S
skv 已提交
36
    @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
37
      group(:commit_id).count
38

39 40
    respond_to do |format|
      format.html
41
      format.json { render json: @merge_request }
I
Izaak Alpert 已提交
42 43
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
44
    end
R
randx 已提交
45 46
  end

47
  def diffs
D
Dmitriy Zaporozhets 已提交
48
    @commit = @merge_request.last_commit
49
    @comments_allowed = @reply_allowed = true
50 51 52 53
    @comments_target = {
      noteable_type: 'MergeRequest',
      noteable_id: @merge_request.id
    }
54
    @line_notes = @merge_request.notes.where("line_code is not null")
B
Boyan Tabakov 已提交
55

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

  def new
D
Dmitriy Zaporozhets 已提交
63 64 65 66 67 68 69 70 71 72 73 74
    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 已提交
75
    @commit = @merge_request.compare_commits.last
D
Dmitriy Zaporozhets 已提交
76 77 78
    @diffs = @merge_request.compare_diffs
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
79 80 81
  end

  def edit
I
Izaak Alpert 已提交
82 83
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
I
Izaak Alpert 已提交
84
    @target_branches = @merge_request.target_project.repository.branch_names
D
Dmitriy Zaporozhets 已提交
85 86 87
  end

  def create
I
Izaak Alpert 已提交
88
    @target_branches ||= []
89
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
90 91

    if @merge_request.valid?
92
      redirect_to(merge_request_path(@merge_request))
93
    else
I
Izaak Alpert 已提交
94 95 96
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
97 98 99 100
    end
  end

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

103
    if @merge_request.valid?
104 105 106
      respond_to do |format|
        format.js
        format.html do
V
Vinnie Okada 已提交
107
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
108
                       @merge_request.target_project, @merge_request])
109
        end
110 111 112 113 114 115
        format.json do
          render json: {
            saved: @merge_request.valid?,
            assignee_avatar_url: @merge_request.assignee.try(:avatar_url)
          }
        end
116
      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 127

    render json: { merge_status: @merge_request.merge_status_name }
V
Valery Sizov 已提交
128 129
  end

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

133
    if @merge_request.open? && @merge_request.can_be_merged?
134
      AutoMergeWorker.perform_async(@merge_request.id, current_user.id, params)
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
155 156 157 158

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

161
  def ci_status
162
    ci_service = @merge_request.source_project.ci_service
V
Valery Sizov 已提交
163
    status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch)
164 165

    if ci_service.respond_to?(:commit_coverage)
V
Valery Sizov 已提交
166
      coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
167 168 169 170 171 172
    end

    response = {
      status: status,
      coverage: coverage
    }
173 174 175 176

    render json: response
  end

V
tests  
Valery Sizov 已提交
177 178
  def toggle_subscription
    @merge_request.toggle_subscription(current_user)
V
Valery Sizov 已提交
179 180 181 182
    
    render nothing: true
  end

D
Dmitriy Zaporozhets 已提交
183 184
  protected

I
Izaak Alpert 已提交
185
  def selected_target_project
186 187 188 189 190
    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 已提交
191 192
  end

D
Dmitriy Zaporozhets 已提交
193
  def merge_request
S
skv 已提交
194
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
195
  end
D
Dmitriy Zaporozhets 已提交
196

197 198 199 200
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
201
  def authorize_modify_merge_request!
202
    return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
203 204 205
  end

  def authorize_admin_merge_request!
206
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
207
  end
208 209 210 211

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
212 213

  def validates_merge_request
214 215 216
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

217 218 219
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
220 221
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
222

223 224
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
225
    end
226 227 228 229
  end

  def define_show_vars
    # Build a note object for comment form
230
    @note = @project.notes.new(noteable: @merge_request)
231 232
    @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
    @discussions = Note.discussions_from_notes(@notes)
233
    @noteable = @merge_request
234

235
    # Get commits from repository
236 237
    # or from cache if already merged
    @commits = @merge_request.commits
238

D
Dmitriy Zaporozhets 已提交
239
    @merge_request_diff = @merge_request.merge_request_diff
240
    @allowed_to_merge = allowed_to_merge?
241
    @show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
242
    @source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
243 244 245 246 247

    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
248 249 250
  end

  def allowed_to_merge?
251
    allowed_to_push_code?(project, @merge_request.target_branch)
252 253 254 255 256 257 258
  end

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

259
  def allowed_to_push_code?(project, branch)
260
    ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(branch)
261
  end
262 263 264 265 266

  def merge_request_params
    params.require(:merge_request).permit(
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
267
      :state_event, :description, :task_num, label_ids: []
268 269
    )
  end
D
Dmitriy Zaporozhets 已提交
270
end