2013-06-23 16:47:22 +00:00
|
|
|
class Projects::IssuesController < Projects::ApplicationController
|
2017-03-31 03:06:09 +00:00
|
|
|
include RendersNotes
|
2016-03-15 16:18:47 +00:00
|
|
|
include ToggleSubscriptionAction
|
2016-03-21 13:12:52 +00:00
|
|
|
include IssuableActions
|
2016-04-16 19:09:08 +00:00
|
|
|
include ToggleAwardEmoji
|
2016-07-23 23:28:12 +00:00
|
|
|
include IssuableCollections
|
2016-08-02 21:21:57 +00:00
|
|
|
include SpammableActions
|
2016-03-15 16:18:47 +00:00
|
|
|
|
2017-03-06 20:18:39 +00:00
|
|
|
prepend_before_action :authenticate_user!, only: [:new]
|
|
|
|
|
2018-01-15 15:21:04 +00:00
|
|
|
before_action :whitelist_query_limiting, only: [:create, :create_merge_request, :move, :bulk_update]
|
2017-06-20 11:13:04 +00:00
|
|
|
before_action :check_issues_available!
|
2017-06-12 16:19:39 +00:00
|
|
|
before_action :issue, except: [:index, :new, :create, :bulk_update]
|
2017-11-07 13:34:12 +00:00
|
|
|
before_action :set_issuables_index, only: [:index]
|
2011-12-15 21:57:46 +00:00
|
|
|
|
|
|
|
# Allow write(create) issue
|
2015-06-26 14:44:21 +00:00
|
|
|
before_action :authorize_create_issue!, only: [:new, :create]
|
2011-12-15 21:57:46 +00:00
|
|
|
|
|
|
|
# Allow modify issue
|
2017-11-01 17:35:14 +00:00
|
|
|
before_action :authorize_update_issuable!, only: [:edit, :update, :move]
|
2014-02-10 13:36:58 +00:00
|
|
|
|
2017-05-04 08:09:21 +00:00
|
|
|
# Allow create a new branch and empty WIP merge request from current issue
|
2018-04-06 17:58:53 +00:00
|
|
|
before_action :authorize_create_merge_request_from!, only: [:create_merge_request]
|
2017-05-04 08:09:21 +00:00
|
|
|
|
2013-11-29 13:05:32 +00:00
|
|
|
respond_to :html
|
2011-10-08 21:36:38 +00:00
|
|
|
|
|
|
|
def index
|
2017-11-07 13:34:12 +00:00
|
|
|
@issues = @issuables
|
2017-01-20 21:35:39 +00:00
|
|
|
|
2011-10-08 21:36:38 +00:00
|
|
|
respond_to do |format|
|
2013-11-29 13:05:32 +00:00
|
|
|
format.html
|
2017-06-12 17:21:13 +00:00
|
|
|
format.atom { render layout: 'xml.atom' }
|
2013-11-29 13:05:32 +00:00
|
|
|
format.json do
|
|
|
|
render json: {
|
2016-04-09 04:09:09 +00:00
|
|
|
html: view_to_html_string("projects/issues/_issues"),
|
2016-04-20 16:00:12 +00:00
|
|
|
labels: @labels.as_json(methods: :text_color)
|
2013-11-29 13:05:32 +00:00
|
|
|
}
|
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def new
|
2014-07-01 12:03:49 +00:00
|
|
|
params[:issue] ||= ActionController::Parameters.new(
|
2017-05-04 12:11:15 +00:00
|
|
|
assignee_ids: ""
|
2014-07-01 12:03:49 +00:00
|
|
|
)
|
2016-12-22 12:31:12 +00:00
|
|
|
build_params = issue_params.merge(
|
2017-03-10 08:19:12 +00:00
|
|
|
merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of],
|
2017-02-27 09:23:36 +00:00
|
|
|
discussion_to_resolve: params[:discussion_to_resolve]
|
2016-12-22 12:31:12 +00:00
|
|
|
)
|
2017-02-27 09:23:36 +00:00
|
|
|
service = Issues::BuildService.new(project, current_user, build_params)
|
2016-12-22 12:31:12 +00:00
|
|
|
|
2017-02-27 09:23:36 +00:00
|
|
|
@issue = @noteable = service.execute
|
2017-03-10 08:19:12 +00:00
|
|
|
@merge_request_to_resolve_discussions_of = service.merge_request_to_resolve_discussions_of
|
2017-02-27 17:12:52 +00:00
|
|
|
@discussion_to_resolve = service.discussions_to_resolve.first if params[:discussion_to_resolve]
|
2014-07-01 12:03:49 +00:00
|
|
|
|
2011-10-08 21:36:38 +00:00
|
|
|
respond_with(@issue)
|
|
|
|
end
|
|
|
|
|
2017-10-26 11:04:07 +00:00
|
|
|
def edit
|
|
|
|
respond_with(@issue)
|
|
|
|
end
|
|
|
|
|
2011-10-08 21:36:38 +00:00
|
|
|
def create
|
2017-02-27 09:23:36 +00:00
|
|
|
create_params = issue_params.merge(spammable_params).merge(
|
2017-03-10 08:19:12 +00:00
|
|
|
merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of],
|
2017-02-27 09:23:36 +00:00
|
|
|
discussion_to_resolve: params[:discussion_to_resolve]
|
|
|
|
)
|
|
|
|
|
2017-03-08 19:16:17 +00:00
|
|
|
service = Issues::CreateService.new(project, current_user, create_params)
|
|
|
|
@issue = service.execute
|
|
|
|
|
2017-03-09 13:25:54 +00:00
|
|
|
if service.discussions_to_resolve.count(&:resolved?) > 0
|
2017-03-10 12:36:50 +00:00
|
|
|
flash[:notice] = if service.discussion_to_resolve_id
|
2017-03-09 13:25:54 +00:00
|
|
|
"Resolved 1 discussion."
|
|
|
|
else
|
|
|
|
"Resolved all discussions."
|
|
|
|
end
|
2017-03-08 19:16:17 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
|
2012-02-29 20:38:24 +00:00
|
|
|
respond_to do |format|
|
2012-08-30 17:00:16 +00:00
|
|
|
format.html do
|
2017-02-14 19:07:11 +00:00
|
|
|
recaptcha_check_with_fallback { render :new }
|
2012-08-30 17:00:16 +00:00
|
|
|
end
|
2016-07-16 16:42:44 +00:00
|
|
|
format.js do
|
2014-05-23 08:22:00 +00:00
|
|
|
@link = @issue.attachment.url.to_js
|
|
|
|
end
|
2012-02-29 20:38:24 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
2017-08-14 07:26:19 +00:00
|
|
|
def move
|
|
|
|
params.require(:move_to_project_id)
|
|
|
|
|
2016-03-18 13:48:55 +00:00
|
|
|
if params[:move_to_project_id].to_i > 0
|
|
|
|
new_project = Project.find(params[:move_to_project_id])
|
2016-04-30 19:14:40 +00:00
|
|
|
return render_404 unless issue.can_move?(current_user, new_project)
|
|
|
|
|
2017-08-14 07:26:19 +00:00
|
|
|
@issue = Issues::UpdateService.new(project, current_user, target_project: new_project).execute(issue)
|
2016-02-17 14:59:25 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
|
|
|
|
respond_to do |format|
|
2014-06-04 15:52:35 +00:00
|
|
|
format.json do
|
2017-08-14 07:26:19 +00:00
|
|
|
render_issue_json
|
2014-06-04 15:52:35 +00:00
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
2016-08-01 15:34:17 +00:00
|
|
|
|
|
|
|
rescue ActiveRecord::StaleObjectError
|
2017-01-16 18:43:03 +00:00
|
|
|
render_conflict_response
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|
|
|
|
|
2016-04-12 13:55:54 +00:00
|
|
|
def referenced_merge_requests
|
2017-01-08 23:09:00 +00:00
|
|
|
@merge_requests, @closed_by_merge_requests = ::Issues::FetchReferencedMergeRequestsService.new(project, current_user).execute(issue)
|
2016-04-12 13:55:54 +00:00
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.json do
|
|
|
|
render json: {
|
|
|
|
html: view_to_html_string('projects/issues/_merge_requests')
|
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def related_branches
|
2016-04-15 04:20:53 +00:00
|
|
|
@related_branches = @issue.related_branches(current_user)
|
2016-04-12 13:55:54 +00:00
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.json do
|
|
|
|
render json: {
|
|
|
|
html: view_to_html_string('projects/issues/_related_branches')
|
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-21 14:34:00 +00:00
|
|
|
def can_create_branch
|
|
|
|
can_create = current_user &&
|
|
|
|
can?(current_user, :push_code, @project) &&
|
|
|
|
@issue.can_be_worked_on?(current_user)
|
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.json do
|
2017-05-04 08:09:21 +00:00
|
|
|
render json: { can_create_branch: can_create, has_related_branch: @issue.has_related_branch? }
|
2016-04-21 14:34:00 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-05-04 08:09:21 +00:00
|
|
|
def create_merge_request
|
2017-11-25 11:33:05 +00:00
|
|
|
create_params = params.slice(:branch_name, :ref).merge(issue_iid: issue.iid)
|
|
|
|
result = ::MergeRequests::CreateFromIssueService.new(project, current_user, create_params).execute
|
2017-05-04 08:09:21 +00:00
|
|
|
|
|
|
|
if result[:status] == :success
|
|
|
|
render json: MergeRequestCreateSerializer.new.represent(result[:merge_request])
|
|
|
|
else
|
|
|
|
render json: result[:messsage], status: :unprocessable_entity
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2011-10-26 13:46:25 +00:00
|
|
|
protected
|
2011-10-17 10:39:03 +00:00
|
|
|
|
|
|
|
def issue
|
2017-06-12 16:19:39 +00:00
|
|
|
return @issue if defined?(@issue)
|
2017-11-14 09:02:39 +00:00
|
|
|
|
2016-10-06 19:09:55 +00:00
|
|
|
# The Sortable default scope causes performance issues when used with find_by
|
2017-11-01 17:35:14 +00:00
|
|
|
@issuable = @noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take!
|
|
|
|
@note = @project.notes.new(noteable: @issuable)
|
2017-06-12 16:19:39 +00:00
|
|
|
|
|
|
|
return render_404 unless can?(current_user, :read_issue, @issue)
|
|
|
|
|
|
|
|
@issue
|
2011-10-17 10:39:03 +00:00
|
|
|
end
|
2016-03-15 16:18:47 +00:00
|
|
|
alias_method :subscribable_resource, :issue
|
2016-03-21 13:12:52 +00:00
|
|
|
alias_method :issuable, :issue
|
2016-04-16 19:09:08 +00:00
|
|
|
alias_method :awardable, :issue
|
2016-08-02 21:21:57 +00:00
|
|
|
alias_method :spammable, :issue
|
2011-12-15 21:57:46 +00:00
|
|
|
|
2017-06-29 17:06:35 +00:00
|
|
|
def spammable_path
|
|
|
|
project_issue_path(@project, @issue)
|
|
|
|
end
|
|
|
|
|
2017-05-04 08:09:21 +00:00
|
|
|
def authorize_create_merge_request!
|
2017-06-13 08:25:25 +00:00
|
|
|
render_404 unless can?(current_user, :push_code, @project) && @issue.can_be_worked_on?(current_user)
|
2017-05-04 08:09:21 +00:00
|
|
|
end
|
|
|
|
|
2017-08-14 07:26:19 +00:00
|
|
|
def render_issue_json
|
|
|
|
if @issue.valid?
|
|
|
|
render json: serializer.represent(@issue)
|
|
|
|
else
|
|
|
|
render json: { errors: @issue.errors.full_messages }, status: :unprocessable_entity
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-06-26 11:30:07 +00:00
|
|
|
def issue_params
|
2017-06-29 10:43:47 +00:00
|
|
|
params.require(:issue).permit(*issue_params_attributes)
|
|
|
|
end
|
|
|
|
|
|
|
|
def issue_params_attributes
|
|
|
|
%i[
|
|
|
|
title
|
|
|
|
assignee_id
|
|
|
|
position
|
|
|
|
description
|
|
|
|
confidential
|
|
|
|
milestone_id
|
|
|
|
due_date
|
|
|
|
state_event
|
|
|
|
task_num
|
|
|
|
lock_version
|
2017-08-30 14:57:50 +00:00
|
|
|
discussion_locked
|
2017-06-29 10:43:47 +00:00
|
|
|
] + [{ label_ids: [], assignee_ids: [] }]
|
2014-06-26 11:30:07 +00:00
|
|
|
end
|
2017-03-23 17:43:47 +00:00
|
|
|
|
|
|
|
def authenticate_user!
|
|
|
|
return if current_user
|
|
|
|
|
|
|
|
notice = "Please sign in to create the new issue."
|
|
|
|
|
2017-05-19 18:35:08 +00:00
|
|
|
if request.get? && !request.xhr?
|
|
|
|
store_location_for :user, request.fullpath
|
|
|
|
end
|
|
|
|
|
2017-03-23 17:43:47 +00:00
|
|
|
redirect_to new_user_session_path, notice: notice
|
|
|
|
end
|
2017-06-23 22:10:05 +00:00
|
|
|
|
|
|
|
def serializer
|
|
|
|
IssueSerializer.new(current_user: current_user, project: issue.project)
|
|
|
|
end
|
2017-11-01 17:35:14 +00:00
|
|
|
|
|
|
|
def update_service
|
|
|
|
update_params = issue_params.merge(spammable_params)
|
|
|
|
Issues::UpdateService.new(project, current_user, update_params)
|
|
|
|
end
|
2017-11-07 13:34:12 +00:00
|
|
|
|
2018-02-20 12:33:49 +00:00
|
|
|
def finder_type
|
|
|
|
IssuesFinder
|
2017-11-07 13:34:12 +00:00
|
|
|
end
|
2018-01-15 15:21:04 +00:00
|
|
|
|
|
|
|
def whitelist_query_limiting
|
|
|
|
# Also see the following issues:
|
|
|
|
#
|
|
|
|
# 1. https://gitlab.com/gitlab-org/gitlab-ce/issues/42423
|
|
|
|
# 2. https://gitlab.com/gitlab-org/gitlab-ce/issues/42424
|
|
|
|
# 3. https://gitlab.com/gitlab-org/gitlab-ce/issues/42426
|
|
|
|
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42422')
|
|
|
|
end
|
2011-10-08 21:36:38 +00:00
|
|
|
end
|