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

3
class Projects::MergeRequestsController < Projects::ApplicationController
4
  before_action :module_enabled
5 6 7 8 9 10 11
  before_action :merge_request, only: [
    :edit, :update, :show, :diffs, :commits, :automerge, :automerge_check,
    :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]
D
Dmitriy Zaporozhets 已提交
12 13

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

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

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

D
Dmitriy Zaporozhets 已提交
22
  def index
23
    terms = params['issue_search']
D
Dmitriy Zaporozhets 已提交
24
    @merge_requests = get_merge_requests_collection
25 26 27 28 29 30 31 32

    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
33

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

    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 已提交
44 45 46
  end

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

50 51
    respond_to do |format|
      format.html
52
      format.json { render json: @merge_request }
I
Izaak Alpert 已提交
53 54
      format.diff { render text: @merge_request.to_diff(current_user) }
      format.patch { render text: @merge_request.to_patch(current_user) }
55
    end
R
randx 已提交
56 57
  end

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

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

73 74 75 76
  def commits
    render 'show'
  end

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

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

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

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

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

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

V
Valery Sizov 已提交
137
  def automerge_check
138
    if @merge_request.unchecked?
V
Valery Sizov 已提交
139 140
      @merge_request.check_if_can_be_merged
    end
141

142 143
    closes_issues

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

R
randx 已提交
147
  def automerge
148
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
149

150
    if @merge_request.automergeable?
151
      AutoMergeWorker.perform_async(@merge_request.id, current_user.id, params)
152 153 154 155
      @status = true
    else
      @status = false
    end
R
randx 已提交
156 157
  end

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

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

I
Izaak Alpert 已提交
169 170
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
171
    @target_branches = @target_project.repository.branch_names
172 173 174 175

    respond_to do |format|
      format.js
    end
I
Izaak Alpert 已提交
176 177
  end

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

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

    response = {
      status: status,
      coverage: coverage
    }
190 191 192 193

    render json: response
  end

V
tests  
Valery Sizov 已提交
194 195
  def toggle_subscription
    @merge_request.toggle_subscription(current_user)
196

V
Valery Sizov 已提交
197 198 199
    render nothing: true
  end

D
Dmitriy Zaporozhets 已提交
200 201
  protected

I
Izaak Alpert 已提交
202
  def selected_target_project
203 204 205 206 207
    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 已提交
208 209
  end

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

214 215 216 217
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
218
  def authorize_modify_merge_request!
219
    return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
220 221 222
  end

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

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
229 230

  def validates_merge_request
231 232 233
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

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

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

  def define_show_vars
    # Build a note object for comment form
247
    @note = @project.notes.new(noteable: @merge_request)
248 249
    @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
    @discussions = Note.discussions_from_notes(@notes)
250
    @noteable = @merge_request
251

252
    # Get commits from repository
253 254
    # or from cache if already merged
    @commits = @merge_request.commits
255

D
Dmitriy Zaporozhets 已提交
256
    @merge_request_diff = @merge_request.merge_request_diff
257
    @source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
258 259 260 261 262

    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
263 264
  end

265 266 267 268 269
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

270 271 272 273
  def merge_request_params
    params.require(:merge_request).permit(
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
274
      :state_event, :description, :task_num, label_ids: []
275 276
    )
  end
D
Dmitriy Zaporozhets 已提交
277
end