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
b27371d8
Commit
b27371d8
authored
Dec 16, 2015
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change pages domain to host
parent
fa68e403
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/project.rb
app/models/project.rb
+1
-1
config/gitlab.yml.example
config/gitlab.yml.example
+1
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
No files found.
app/models/project.rb
View file @
b27371d8
...
@@ -1164,7 +1164,7 @@ class Project < ActiveRecord::Base
...
@@ -1164,7 +1164,7 @@ class Project < ActiveRecord::Base
def
pages_url
def
pages_url
if
Dir
.
exist?
(
public_pages_path
)
if
Dir
.
exist?
(
public_pages_path
)
host
=
"
#{
namespace
.
path
}
.
#{
Settings
.
pages
.
domain
}
"
host
=
"
#{
namespace
.
path
}
.
#{
Settings
.
pages
.
host
}
"
url
=
Gitlab
.
config
.
pages
.
url
.
sub
(
/^https?:\/\//
)
do
|
prefix
|
url
=
Gitlab
.
config
.
pages
.
url
.
sub
(
/^https?:\/\//
)
do
|
prefix
|
"
#{
prefix
}#{
namespace
.
path
}
."
"
#{
prefix
}#{
namespace
.
path
}
."
end
end
...
...
config/gitlab.yml.example
View file @
b27371d8
...
@@ -162,7 +162,7 @@ production: &base
...
@@ -162,7 +162,7 @@ production: &base
# The domain under which the pages are served:
# The domain under which the pages are served:
# http://group.example.com/project
# http://group.example.com/project
# or project path can be a group page: group.example.com
# or project path can be a group page: group.example.com
domain
: example.com
host
: example.com
port: 80 # Set to 443 if you serve the pages with HTTPS
port: 80 # Set to 443 if you serve the pages with HTTPS
https: false # Set to true if you serve the pages with HTTPS
https: false # Set to true if you serve the pages with HTTPS
...
...
config/initializers/1_settings.rb
View file @
b27371d8
...
@@ -264,7 +264,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path'
...
@@ -264,7 +264,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path'
Settings
[
'pages'
]
||=
Settingslogic
.
new
({})
Settings
[
'pages'
]
||=
Settingslogic
.
new
({})
Settings
.
pages
[
'enabled'
]
=
false
if
Settings
.
pages
[
'enabled'
].
nil?
Settings
.
pages
[
'enabled'
]
=
false
if
Settings
.
pages
[
'enabled'
].
nil?
Settings
.
pages
[
'path'
]
=
File
.
expand_path
(
'shared/pages/'
,
Rails
.
root
)
Settings
.
pages
[
'path'
]
=
File
.
expand_path
(
'shared/pages/'
,
Rails
.
root
)
Settings
.
pages
[
'
domain'
]
||=
"example.com"
Settings
.
pages
[
'
host'
]
||=
"example.com"
Settings
.
pages
[
'https'
]
=
false
if
Settings
.
pages
[
'https'
].
nil?
Settings
.
pages
[
'https'
]
=
false
if
Settings
.
pages
[
'https'
].
nil?
Settings
.
pages
[
'port'
]
||=
Settings
.
pages
.
https
?
443
:
80
Settings
.
pages
[
'port'
]
||=
Settings
.
pages
.
https
?
443
:
80
Settings
.
pages
[
'protocol'
]
||=
Settings
.
pages
.
https
?
"https"
:
"http"
Settings
.
pages
[
'protocol'
]
||=
Settings
.
pages
.
https
?
"https"
:
"http"
...
...
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