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
725f30d0
Commit
725f30d0
authored
Dec 16, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-add missing gitlab_on_standard_port
parent
23272ee1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+6
-2
No files found.
config/initializers/1_settings.rb
View file @
725f30d0
...
@@ -5,8 +5,8 @@ class Settings < Settingslogic
...
@@ -5,8 +5,8 @@ class Settings < Settingslogic
namespace
Rails
.
env
namespace
Rails
.
env
class
<<
self
class
<<
self
def
on_standard_port?
(
config
)
def
gitlab_on_standard_port?
config
.
port
.
to_i
==
(
config
.
https
?
443
:
80
)
on_standard_port?
(
gitlab
)
end
end
# get host without www, thanks to http://stackoverflow.com/a/6674363/1233435
# get host without www, thanks to http://stackoverflow.com/a/6674363/1233435
...
@@ -115,6 +115,10 @@ class Settings < Settingslogic
...
@@ -115,6 +115,10 @@ class Settings < Settingslogic
custom_port
custom_port
]
]
end
end
def
on_standard_port?
(
config
)
config
.
port
.
to_i
==
(
config
.
https
?
443
:
80
)
end
end
end
end
end
...
...
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