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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
aa9435cd
Commit
aa9435cd
authored
Apr 25, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicate settings for default_url_options
Closes internal
https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
parent
439b9f50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
23 deletions
+1
-23
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+0
-12
app/mailers/notify.rb
app/mailers/notify.rb
+1
-6
app/models/project_services/gitlab_issue_tracker_service.rb
app/models/project_services/gitlab_issue_tracker_service.rb
+0
-5
No files found.
app/controllers/application_controller.rb
View file @
aa9435cd
...
@@ -182,18 +182,6 @@ class ApplicationController < ActionController::Base
...
@@ -182,18 +182,6 @@ class ApplicationController < ActionController::Base
response
.
headers
[
"Expires"
]
=
"Fri, 01 Jan 1990 00:00:00 GMT"
response
.
headers
[
"Expires"
]
=
"Fri, 01 Jan 1990 00:00:00 GMT"
end
end
def
default_url_options
if
!
Rails
.
env
.
test?
port
=
Gitlab
.
config
.
gitlab
.
port
unless
Gitlab
.
config
.
gitlab_on_standard_port?
{
host:
Gitlab
.
config
.
gitlab
.
host
,
protocol:
Gitlab
.
config
.
gitlab
.
protocol
,
port:
port
,
script_name:
Gitlab
.
config
.
gitlab
.
relative_url_root
}
else
super
end
end
def
default_headers
def
default_headers
headers
[
'X-Frame-Options'
]
=
'DENY'
headers
[
'X-Frame-Options'
]
=
'DENY'
headers
[
'X-XSS-Protection'
]
=
'1; mode=block'
headers
[
'X-XSS-Protection'
]
=
'1; mode=block'
...
...
app/mailers/notify.rb
View file @
aa9435cd
...
@@ -16,11 +16,6 @@ class Notify < ActionMailer::Base
...
@@ -16,11 +16,6 @@ class Notify < ActionMailer::Base
attr_accessor
:current_user
attr_accessor
:current_user
helper_method
:current_user
,
:can?
helper_method
:current_user
,
:can?
default_url_options
[
:host
]
=
Gitlab
.
config
.
gitlab
.
host
default_url_options
[
:protocol
]
=
Gitlab
.
config
.
gitlab
.
protocol
default_url_options
[
:port
]
=
Gitlab
.
config
.
gitlab
.
port
unless
Gitlab
.
config
.
gitlab_on_standard_port?
default_url_options
[
:script_name
]
=
Gitlab
.
config
.
gitlab
.
relative_url_root
default
from:
Proc
.
new
{
default_sender_address
.
format
}
default
from:
Proc
.
new
{
default_sender_address
.
format
}
default
reply_to:
Gitlab
.
config
.
gitlab
.
email_reply_to
default
reply_to:
Gitlab
.
config
.
gitlab
.
email_reply_to
...
@@ -69,7 +64,7 @@ class Notify < ActionMailer::Base
...
@@ -69,7 +64,7 @@ class Notify < ActionMailer::Base
# Only the displayed name changes; the actual email address is always the same.
# Only the displayed name changes; the actual email address is always the same.
def
sender
(
sender_id
,
send_from_user_email
=
false
)
def
sender
(
sender_id
,
send_from_user_email
=
false
)
return
unless
sender
=
User
.
find
(
sender_id
)
return
unless
sender
=
User
.
find
(
sender_id
)
address
=
default_sender_address
address
=
default_sender_address
address
.
display_name
=
sender
.
name
address
.
display_name
=
sender
.
name
...
...
app/models/project_services/gitlab_issue_tracker_service.rb
View file @
aa9435cd
...
@@ -21,11 +21,6 @@
...
@@ -21,11 +21,6 @@
class
GitlabIssueTrackerService
<
IssueTrackerService
class
GitlabIssueTrackerService
<
IssueTrackerService
include
Rails
.
application
.
routes
.
url_helpers
include
Rails
.
application
.
routes
.
url_helpers
default_url_options
[
:host
]
=
Gitlab
.
config
.
gitlab
.
host
default_url_options
[
:protocol
]
=
Gitlab
.
config
.
gitlab
.
protocol
default_url_options
[
:port
]
=
Gitlab
.
config
.
gitlab
.
port
unless
Gitlab
.
config
.
gitlab_on_standard_port?
default_url_options
[
:script_name
]
=
Gitlab
.
config
.
gitlab
.
relative_url_root
prop_accessor
:title
,
:description
,
:project_url
,
:issues_url
,
:new_issue_url
prop_accessor
:title
,
:description
,
:project_url
,
:issues_url
,
:new_issue_url
def
default?
def
default?
...
...
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