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

3
class Projects::MergeRequestsController < Projects::ApplicationController
4
  before_filter :module_enabled
D
Dmitriy Zaporozhets 已提交
5
  before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
6
  before_filter :validates_merge_request, only: [:show, :diffs]
7
  before_filter :define_show_vars, only: [:show, :diffs]
D
Dmitriy Zaporozhets 已提交
8 9 10 11 12

  # Allow read any merge_request
  before_filter :authorize_read_merge_request!

  # Allow write(create) merge_request
13
  before_filter :authorize_write_merge_request!, only: [:new, :create]
D
Dmitriy Zaporozhets 已提交
14 15

  # Allow modify merge_request
16
  before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
D
Dmitriy Zaporozhets 已提交
17

D
Dmitriy Zaporozhets 已提交
18
  def index
19
    @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
D
Dmitriy Zaporozhets 已提交
20 21 22
  end

  def show
23 24
    respond_to do |format|
      format.html
25
      format.js
26

I
Izaak Alpert 已提交
27 28
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
29
    end
R
randx 已提交
30 31
  end

32
  def diffs
D
Dmitriy Zaporozhets 已提交
33
    @commit = @merge_request.last_commit
34

35
    @comments_allowed = @reply_allowed = true
I
Izaak Alpert 已提交
36 37
    @comments_target = {noteable_type: 'MergeRequest',
                        noteable_id: @merge_request.id}
38
    @line_notes = @merge_request.notes.where("line_code is not null")
D
Dmitriy Zaporozhets 已提交
39 40 41
  end

  def new
D
Dmitriy Zaporozhets 已提交
42
    @merge_request = @project.merge_requests.new(params[:merge_request])
I
Izaak Alpert 已提交
43 44 45 46 47 48 49 50 51 52 53

    if params[:merge_request] && params[:merge_request][:source_project_id]
      @merge_request.source_project = Project.find_by_id(params[:merge_request][:source_project_id])
    else
      @merge_request.source_project = @project
    end
    if params[:merge_request] && params[:merge_request][:target_project_id]
      @merge_request.target_project = Project.find_by_id(params[:merge_request][:target_project_id])
    end
    @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names
    @merge_request
D
Dmitriy Zaporozhets 已提交
54 55 56
  end

  def edit
I
Izaak Alpert 已提交
57
    @target_branches = @merge_request.target_project.repository.branch_names
D
Dmitriy Zaporozhets 已提交
58 59 60 61 62
  end

  def create
    @merge_request = @project.merge_requests.new(params[:merge_request])
    @merge_request.author = current_user
I
Izaak Alpert 已提交
63 64 65
    @merge_request.source_project_id = params[:merge_request][:source_project_id].to_i
    @merge_request.target_project_id = params[:merge_request][:target_project_id].to_i
    @target_branches ||= []
66 67
    if @merge_request.save
      @merge_request.reload_code
I
Izaak Alpert 已提交
68
      redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.'
69
    else
70
      render "new"
D
Dmitriy Zaporozhets 已提交
71 72 73 74
    end
  end

  def update
75
    if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
76 77 78 79
      @merge_request.reload_code
      @merge_request.mark_as_unchecked
      redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.'
    else
80
      render "edit"
D
Dmitriy Zaporozhets 已提交
81 82 83
    end
  end

V
Valery Sizov 已提交
84
  def automerge_check
85
    if @merge_request.unchecked?
V
Valery Sizov 已提交
86 87
      @merge_request.check_if_can_be_merged
    end
88
    render json: {merge_status: @merge_request.merge_status_name}
89
  rescue Gitlab::SatelliteNotExistError
A
Andrew8xx8 已提交
90
    render json: {merge_status: :no_satellite}
V
Valery Sizov 已提交
91 92
  end

R
randx 已提交
93
  def automerge
94 95
    return access_denied! unless allowed_to_merge?

A
Andrew8xx8 已提交
96
    if @merge_request.opened? && @merge_request.can_be_merged?
97
      @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
98 99 100 101 102
      @merge_request.automerge!(current_user)
      @status = true
    else
      @status = false
    end
R
randx 已提交
103 104
  end

105
  def branch_from
I
Izaak Alpert 已提交
106
    #This is always source
107
    @commit = @repository.commit(params[:ref])
108 109 110
  end

  def branch_to
I
Izaak Alpert 已提交
111 112
    @target_project = selected_target_project
    @commit = @target_project.repository.commit(params[:ref])
113 114
  end

I
Izaak Alpert 已提交
115 116 117 118 119 120 121
  def update_branches
    @target_project = selected_target_project
    @target_branches = (@target_project.repository.branch_names).unshift("Select branch")
    @target_branches
  end


122 123
  def ci_status
    status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
I
Izaak Alpert 已提交
124
    response = {status: status}
125 126 127 128

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
129 130
  protected

I
Izaak Alpert 已提交
131 132 133 134 135
  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 已提交
136 137 138
  def merge_request
    @merge_request ||= @project.merge_requests.find(params[:id])
  end
D
Dmitriy Zaporozhets 已提交
139 140

  def authorize_modify_merge_request!
141
    return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
142 143 144
  end

  def authorize_admin_merge_request!
145
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
146
  end
147 148 149 150

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
151 152

  def validates_merge_request
K
Kevin Lyda 已提交
153
    # Show git not found page if target branch doesn't exist
I
Izaak Alpert 已提交
154
    return invalid_mr unless @merge_request.target_project.repository.branch_names.include?(@merge_request.target_branch)
155

K
Kevin Lyda 已提交
156
    # Show git not found page if source branch doesn't exist
157
    # and there is no saved commits between source & target branch
I
Izaak Alpert 已提交
158
    return invalid_mr if !@merge_request.source_project.repository.branch_names.include?(@merge_request.source_branch) && @merge_request.commits.blank?
159 160 161 162
  end

  def define_show_vars
    # Build a note object for comment form
163
    @note = @project.notes.new(noteable: @merge_request)
164

165
    # Get commits from repository
166 167
    # or from cache if already merged
    @commits = @merge_request.commits
168 169 170

    @allowed_to_merge = allowed_to_merge?
    @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
171 172 173

    @target_type = :merge_request
    @target_id = @merge_request.id
174 175 176 177 178 179 180 181 182 183
  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)
184
  end
185 186 187 188 189

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