Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
97dddf39
Commit
97dddf39
authored
Aug 19, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable “issue by email” feature until it uses a different token
parent
c711fe15
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
6 deletions
+9
-6
CHANGELOG
CHANGELOG
+0
-1
app/models/project.rb
app/models/project.rb
+4
-1
lib/gitlab/email/handler.rb
lib/gitlab/email/handler.rb
+2
-1
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+1
-1
spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
CHANGELOG
View file @
97dddf39
...
@@ -88,7 +88,6 @@ v 8.11.0 (unreleased)
...
@@ -88,7 +88,6 @@ v 8.11.0 (unreleased)
- Add archived badge to project list !5798
- Add archived badge to project list !5798
- Add simple identifier to public SSH keys (muteor)
- Add simple identifier to public SSH keys (muteor)
- Admin page now references docs instead of a specific file !5600 (AnAverageHuman)
- Admin page now references docs instead of a specific file !5600 (AnAverageHuman)
- Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363
- Fix filter input alignment (ClemMakesApps)
- Fix filter input alignment (ClemMakesApps)
- Include old revision in merge request update hooks (Ben Boeckel)
- Include old revision in merge request update hooks (Ben Boeckel)
- Add build event color in HipChat messages (David Eisner)
- Add build event color in HipChat messages (David Eisner)
...
...
app/models/project.rb
View file @
97dddf39
...
@@ -611,7 +611,10 @@ class Project < ActiveRecord::Base
...
@@ -611,7 +611,10 @@ class Project < ActiveRecord::Base
end
end
def
new_issue_address
(
author
)
def
new_issue_address
(
author
)
if
Gitlab
::
IncomingEmail
.
enabled?
&&
author
# This feature is disabled for the time being.
return
nil
if
Gitlab
::
IncomingEmail
.
enabled?
&&
author
# rubocop:disable Lint/UnreachableCode
Gitlab
::
IncomingEmail
.
reply_address
(
Gitlab
::
IncomingEmail
.
reply_address
(
"
#{
path_with_namespace
}
+
#{
author
.
authentication_token
}
"
)
"
#{
path_with_namespace
}
+
#{
author
.
authentication_token
}
"
)
end
end
...
...
lib/gitlab/email/handler.rb
View file @
97dddf39
...
@@ -4,7 +4,8 @@ require 'gitlab/email/handler/create_issue_handler'
...
@@ -4,7 +4,8 @@ require 'gitlab/email/handler/create_issue_handler'
module
Gitlab
module
Gitlab
module
Email
module
Email
module
Handler
module
Handler
HANDLERS
=
[
CreateNoteHandler
,
CreateIssueHandler
]
# The `CreateIssueHandler` feature is disabled for the time being.
HANDLERS
=
[
CreateNoteHandler
]
def
self
.
for
(
mail
,
mail_key
)
def
self
.
for
(
mail
,
mail_key
)
HANDLERS
.
find
do
|
klass
|
HANDLERS
.
find
do
|
klass
|
...
...
spec/features/issues_spec.rb
View file @
97dddf39
...
@@ -525,7 +525,7 @@ describe 'Issues', feature: true do
...
@@ -525,7 +525,7 @@ describe 'Issues', feature: true do
end
end
end
end
describe
'new issue by email'
do
x
describe
'new issue by email'
do
shared_examples
'show the email in the modal'
do
shared_examples
'show the email in the modal'
do
before
do
before
do
stub_incoming_email_setting
(
enabled:
true
,
address:
"p+%{key}@gl.ab"
)
stub_incoming_email_setting
(
enabled:
true
,
address:
"p+%{key}@gl.ab"
)
...
...
spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
View file @
97dddf39
require
'spec_helper'
require
'spec_helper'
require_relative
'../email_shared_blocks'
require_relative
'../email_shared_blocks'
describe
Gitlab
::
Email
::
Handler
::
CreateIssueHandler
,
lib:
true
do
x
describe
Gitlab
::
Email
::
Handler
::
CreateIssueHandler
,
lib:
true
do
include_context
:email_shared_context
include_context
:email_shared_context
it_behaves_like
:email_shared_examples
it_behaves_like
:email_shared_examples
...
...
spec/models/project_spec.rb
View file @
97dddf39
...
@@ -247,7 +247,7 @@ describe Project, models: true do
...
@@ -247,7 +247,7 @@ describe Project, models: true do
end
end
end
end
describe
"#new_issue_address"
do
x
describe
"#new_issue_address"
do
let
(
:project
)
{
create
(
:empty_project
,
path:
"somewhere"
)
}
let
(
:project
)
{
create
(
:empty_project
,
path:
"somewhere"
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment