diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-10-18 19:03:31 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-11-07 15:56:18 +0000 |
| commit | 011e561bfa227f3ecbafe5b1ffd51700c680a15f (patch) | |
| tree | 58af709e0f38dbfd7d389e2c3ad5516507ca2946 /app/controllers/projects_controller.rb | |
| parent | 9d51421346178c9189ffb47189f51d573ab42822 (diff) | |
| download | gitlab-ce-011e561bfa227f3ecbafe5b1ffd51700c680a15f.tar.gz | |
implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-email
reactivates all tests and writes more tests for it
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6988527a3be..4d5725448cd 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -160,6 +160,13 @@ class ProjectsController < Projects::ApplicationController end end + def new_issue_address + return render_404 unless Gitlab::IncomingEmail.supports_issue_creation? + + current_user.reset_incoming_email_token! + render json: { new_issue_address: @project.new_issue_address(current_user) } + end + def archive return access_denied! unless can?(current_user, :archive_project, @project) |