Skip to content
Snippets Groups Projects
merge_requests_controller.rb 10.8 KiB
Newer Older
  • Learn to ignore specific revisions
  • class Projects::MergeRequestsController < Projects::ApplicationController
    
      include ToggleSubscriptionAction
    
      include DiffHelper
    
      include IssuableActions
    
      before_action :module_enabled
    
      before_action :merge_request, only: [
    
        :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check,
    
        :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip
    
      before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits, :builds]
      before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds]
      before_action :define_show_vars, only: [:show, :diffs, :commits, :builds]
    
      before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
    
      before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds]
    
    
      # Allow read any merge_request
    
      before_action :authorize_read_merge_request!
    
    
      # Allow write(create) merge_request
    
      before_action :authorize_create_merge_request!, only: [:new, :create]
    
    
      # Allow modify merge_request
    
      before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort]
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      def index
    
        terms = params['issue_search']
    
        @merge_requests = get_merge_requests_collection
    
    
        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
    
        @merge_requests = @merge_requests.page(params[:page])
    
        @merge_requests = @merge_requests.preload(:target_project)
    
        @labels = @project.labels.where(title: params[:label_name])
    
        respond_to do |format|
          format.html
          format.json do
            render json: {
    
              html: view_to_html_string("projects/merge_requests/_merge_requests"),
    
              labels: @labels.as_json(methods: :text_color)
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      end
    
      def show
    
        @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
    
        respond_to do |format|
          format.html
    
          format.json { render json: @merge_request }
    
          format.diff { render text: @merge_request.to_diff }
          format.patch { render text: @merge_request.to_patch }
    
    randx's avatar
    randx committed
      end
    
    
        @commit = @merge_request.last_commit
    
        @base_commit = @merge_request.diff_base_commit
    
        # MRs created before 8.4 don't have a diff_base_commit,
        # but we need it for the "View file @ ..." link by deleted files
        @base_commit ||= @merge_request.first_commit.parent || @merge_request.first_commit
    
        @comments_target = {
          noteable_type: 'MergeRequest',
          noteable_id: @merge_request.id
        }
    
    
        @grouped_diff_notes = @merge_request.notes.grouped_diff_notes
    
        respond_to do |format|
          format.html
          format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
        end
    
        respond_to do |format|
          format.html { render 'show' }
          format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_commits') } }
        end
    
      def builds
        respond_to do |format|
          format.html { render 'show' }
          format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
        end
      end
    
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      def new
    
        params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
        @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
    
        @noteable = @merge_request
    
    
        @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.reverse
    
        @commit = @merge_request.last_commit
    
        @base_commit = @merge_request.diff_base_commit
    
        @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
    
        @diff_notes_disabled = true
    
    
        @ci_commit = @merge_request.ci_commit
        @statuses = @ci_commit.statuses if @ci_commit
    
    
        @note_counts = Note.where(commit_id: @commits.map(&:id)).
          group(:commit_id).count
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      end
    
      def create
    
        @target_branches ||= []
    
        @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
    
          redirect_to(merge_request_path(@merge_request))
    
          @source_project = @merge_request.source_project
          @target_project = @merge_request.target_project
          render action: "new"
    
      def edit
        @source_project = @merge_request.source_project
        @target_project = @merge_request.target_project
        @target_branches = @merge_request.target_project.repository.branch_names
      end
    
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      def update
    
        @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
    
        if @merge_request.valid?
    
          respond_to do |format|
            format.html do
    
    Vinnie Okada's avatar
    Vinnie Okada committed
              redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
    
                           @merge_request.target_project, @merge_request])
    
              render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
    
      def remove_wip
        MergeRequests::UpdateService.new(project, current_user, title: @merge_request.wipless_title).execute(@merge_request)
    
        redirect_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request),
          notice: "The merge request can now be merged."
      end
    
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        render partial: "projects/merge_requests/widget/show.html.haml", layout: false
    
      def cancel_merge_when_build_succeeds
    
        return access_denied! unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
    
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user).cancel(@merge_request)
    
        return access_denied! unless @merge_request.can_be_merged_by?(current_user)
    
        unless @merge_request.mergeable?
          @status = :failed
          return
        end
    
    
        TodoService.new.merge_merge_request(merge_request, current_user)
    
        @merge_request.update(merge_error: nil)
    
    
        if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit && @merge_request.ci_commit.active?
    
          MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
    
                                                          .execute(@merge_request)
          @status = :merge_when_build_succeeds
    
          MergeWorker.perform_async(@merge_request.id, current_user.id, params)
          @status = :success
    
        #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]) if params[:ref].present?
    
        render layout: false
    
        @target_project = selected_target_project
    
        @commit = @target_project.commit(params[:ref]) if params[:ref].present?
    
        render layout: false
    
      def update_branches
        @target_project = selected_target_project
    
        @target_branches = @target_project.repository.branch_names
    
        render layout: false
    
        ci_commit = @merge_request.ci_commit
        if ci_commit
    
    Phil Hughes's avatar
    Phil Hughes committed
          status = ci_commit.status
    
          coverage = ci_commit.try(:coverage)
    
        else
          ci_service = @merge_request.source_project.ci_service
          status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch) if ci_service
    
          if ci_service.respond_to?(:commit_coverage)
            coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
          end
    
          title: merge_request.title,
          sha: merge_request.last_commit_short_sha,
    
          status: status,
          coverage: coverage
        }
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      protected
    
    
      def selected_target_project
    
        if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil?
          @project
        else
          @project.forked_project_link.forked_from_project
        end
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
      def merge_request
    
    skv's avatar
    skv committed
        @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
    
      alias_method :subscribable_resource, :merge_request
    
      alias_method :issuable, :merge_request
    
      def closes_issues
        @closes_issues ||= @merge_request.closes_issues
      end
    
    
      def authorize_update_merge_request!
    
        return render_404 unless can?(current_user, :update_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
    
        # If source project was removed (Ex. mr from fork to origin)
        return invalid_mr unless @merge_request.source_project
    
    
        # Show git not found page
        # if there is no saved commits between source & target branch
        if @merge_request.commits.blank?
    
          # and if target branch doesn't exist
          return invalid_mr unless @merge_request.target_branch_exists?
    
          # or if source branch doesn't exist
          return invalid_mr unless @merge_request.source_branch_exists?
    
      end
    
      def define_show_vars
        # Build a note object for comment form
    
        @note = @project.notes.new(noteable: @merge_request)
    
        @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
    
        @discussions = @notes.discussions
    
        @noteable = @merge_request
    
        # Get commits from repository
    
        # or from cache if already merged
        @commits = @merge_request.commits
    
        @merge_request_diff = @merge_request.merge_request_diff
    
        @ci_commit = @merge_request.ci_commit
    
        @statuses = @ci_commit.statuses if @ci_commit
    
        if @merge_request.locked_long_ago?
          @merge_request.unlock_mr
          @merge_request.close
        end
    
      def define_widget_vars
        @ci_commit = @merge_request.ci_commit
    
        @ci_commits = [@ci_commit].compact
    
      def invalid_mr
        # Render special view for MR with removed source or target branch
        render 'invalid'
      end
    
    
        params.require(:merge_request).permit(
    
          :title, :assignee_id, :source_project_id, :source_branch,
          :target_project_id, :target_branch, :milestone_id,
    
          :state_event, :description, :task_num, :force_remove_source_branch,
          label_ids: []
    
      def merge_params
        params.permit(:should_remove_source_branch, :commit_message)
      end
    
    
      # 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