diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-08-19 00:38:42 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-08-19 00:41:16 +0300 |
commit | 717366d28da11acc6dbe60301bf7e2394400b3c1 (patch) | |
tree | ba3a95c9bf1627519c00dab30562d5cd4f646857 /app/services/issues | |
parent | d97c83096a70ed102f993d4c484aff9c786ca831 (diff) | |
parent | 2703330a19e813351e9c33241a59d6b7f54741df (diff) |
Merge branch '4273-slash-commands' into 'master'
Support slash commands in issues / MR description & comments
See merge request !5021
Diffstat (limited to 'app/services/issues')
-rw-r--r-- | app/services/issues/close_service.rb | 2 | ||||
-rw-r--r-- | app/services/issues/create_service.rb | 27 | ||||
-rw-r--r-- | app/services/issues/reopen_service.rb | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb index 859c934ea3b..45cca216ccc 100644 --- a/app/services/issues/close_service.rb +++ b/app/services/issues/close_service.rb @@ -1,6 +1,8 @@ module Issues class CloseService < Issues::BaseService def execute(issue, commit: nil, notifications: true, system_note: true) + return issue unless can?(current_user, :update_issue, issue) + if project.jira_tracker? && project.jira_service.active project.jira_service.execute(commit, issue) todo_service.close_issue(issue, current_user) diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index 65550ab8ec6..ea1690f3e38 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -1,26 +1,23 @@ module Issues class CreateService < Issues::BaseService def execute - filter_params - label_params = params.delete(:label_ids) @request = params.delete(:request) @api = params.delete(:api) - @issue = project.issues.new(params) - @issue.author = params[:author] || current_user - @issue.spam = spam_service.check(@api) + @issue = project.issues.new - if @issue.save - @issue.update_attributes(label_ids: label_params) - notification_service.new_issue(@issue, current_user) - todo_service.new_issue(@issue, current_user) - event_service.open_issue(@issue, current_user) - user_agent_detail_service.create - @issue.create_cross_references!(current_user) - execute_hooks(@issue, 'open') - end + create(@issue) + end + + def before_create(issuable) + issuable.spam = spam_service.check(@api) + end - @issue + def after_create(issuable) + event_service.open_issue(issuable, current_user) + notification_service.new_issue(issuable, current_user) + todo_service.new_issue(issuable, current_user) + user_agent_detail_service.create end private diff --git a/app/services/issues/reopen_service.rb b/app/services/issues/reopen_service.rb index e48ca359f4f..40fbe354492 100644 --- a/app/services/issues/reopen_service.rb +++ b/app/services/issues/reopen_service.rb @@ -1,6 +1,8 @@ module Issues class ReopenService < Issues::BaseService def execute(issue) + return issue unless can?(current_user, :update_issue, issue) + if issue.reopen event_service.reopen_issue(issue, current_user) create_note(issue) |