Skip to content
Snippets Groups Projects
merge_requests_controller.rb 6.22 KiB
Newer Older
  • Learn to ignore specific revisions
  • require 'gitlab/satellite/satellite'
    
    
    class Projects::MergeRequestsController < Projects::ApplicationController
    
      before_filter :module_enabled
    
      before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
    
      before_filter :validates_merge_request, only: [:show, :diffs]
    
      before_filter :define_show_vars, only: [:show, :diffs]
    
    
      # Allow read any merge_request
      before_filter :authorize_read_merge_request!
    
      # Allow write(create) merge_request
    
      before_filter :authorize_write_merge_request!, only: [:new, :create]
    
    
      # Allow modify merge_request
    
      before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      def index
    
        @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      end
    
      def show
    
        respond_to do |format|
          format.html
    
          format.diff { render text: @merge_request.to_diff(current_user) }
          format.patch { render text: @merge_request.to_patch(current_user) }
    
    randx's avatar
    randx committed
      end
    
    
        @commit = @merge_request.last_commit
    
        @comments_allowed = @reply_allowed = true
    
        @comments_target = {noteable_type: 'MergeRequest',
                            noteable_id: @merge_request.id}
    
        @line_notes = @merge_request.notes.where("line_code is not null")
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      end
    
      def new
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        @merge_request = @project.merge_requests.new(params[:merge_request])
    
    
        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
    
    Izaak Alpert's avatar
    Izaak Alpert committed
        @source_project = @merge_request.source_project
    
        @merge_request
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      end
    
      def edit
    
    Izaak Alpert's avatar
    Izaak Alpert committed
        @source_project = @merge_request.source_project
        @target_project = @merge_request.target_project
    
        @target_branches = @merge_request.target_project.repository.branch_names
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      end
    
      def create
        @merge_request = @project.merge_requests.new(params[:merge_request])
        @merge_request.author = current_user
    
        @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 ||= []
    
        if @merge_request.save
          @merge_request.reload_code
    
          redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.'
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        end
      end
    
      def update
    
        if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
    
          @merge_request.reload_code
          @merge_request.mark_as_unchecked
    
    Izaak Alpert's avatar
    Izaak Alpert committed
          redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.'
    
      def automerge_check
    
        if @merge_request.unchecked?
    
          @merge_request.check_if_can_be_merged
        end
    
        render json: {merge_status: @merge_request.merge_status_name}
    
      rescue Gitlab::SatelliteNotExistError
    
        render json: {merge_status: :no_satellite}
    
    randx's avatar
    randx committed
      def automerge
    
        return access_denied! unless allowed_to_merge?
    
    
        if @merge_request.opened? && @merge_request.can_be_merged?
    
          @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
    
          @merge_request.automerge!(current_user)
          @status = true
        else
          @status = false
        end
    
        #This is always source
    
    Izaak Alpert's avatar
    Izaak Alpert committed
        @source_project = @merge_request.nil? ? @project : @merge_request.source_project
    
        @commit = @repository.commit(params[:ref])
    
        @target_project = selected_target_project
        @commit = @target_project.repository.commit(params[:ref])
    
      def update_branches
        @target_project = selected_target_project
        @target_branches = (@target_project.repository.branch_names).unshift("Select branch")
        @target_branches
      end
    
    
    
      def ci_status
        status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
    
        response = {status: status}
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      protected
    
    
      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
    
    
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      def merge_request
    
    Izaak Alpert's avatar
    Izaak Alpert committed
        @merge_request ||= MergeRequest.find_by_id(params[:id])
    
    
      def authorize_modify_merge_request!
    
        return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
    
      end
    
      def authorize_admin_merge_request!
    
        return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
    
    
      def module_enabled
        return render_404 unless @project.merge_requests_enabled
      end
    
    
      def validates_merge_request
    
    Kevin Lyda's avatar
    Kevin Lyda committed
        # Show git not found page if target branch doesn't exist
    
        return invalid_mr unless @merge_request.target_project.repository.branch_names.include?(@merge_request.target_branch)
    
    Kevin Lyda's avatar
    Kevin Lyda committed
        # Show git not found page if source branch doesn't exist
    
        # and there is no saved commits between source & target branch
    
        return invalid_mr if !@merge_request.source_project.repository.branch_names.include?(@merge_request.source_branch) && @merge_request.commits.blank?
    
      end
    
      def define_show_vars
        # Build a note object for comment form
    
        @note = @project.notes.new(noteable: @merge_request)
    
        # Get commits from repository
    
        # or from cache if already merged
        @commits = @merge_request.commits
    
    
        @allowed_to_merge = allowed_to_merge?
        @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
    
    
        @target_type = :merge_request
        @target_id = @merge_request.id
    
      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)
    
    
      def invalid_mr
        # Render special view for MR with removed source or target branch
        render 'invalid'
      end