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
2c8d4f1a
Commit
2c8d4f1a
authored
Apr 13, 2018
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport GitLab domain helper methods
parent
3a1b961d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
config/initializers/deprecations.rb
config/initializers/deprecations.rb
+1
-1
lib/gitlab.rb
lib/gitlab.rb
+7
-10
spec/lib/gitlab_spec.rb
spec/lib/gitlab_spec.rb
+6
-0
No files found.
config/initializers/deprecations.rb
View file @
2c8d4f1a
deprecator
=
ActiveSupport
::
Deprecation
.
new
(
'11.0'
,
'GitLab'
)
deprecator
=
ActiveSupport
::
Deprecation
.
new
(
'11.0'
,
'GitLab'
)
if
Gitlab
.
inc_controlled
?
||
Rails
.
env
.
development?
if
Gitlab
.
com
?
||
Rails
.
env
.
development?
ActiveSupport
::
Deprecation
.
deprecate_methods
(
Gitlab
::
GitalyClient
::
StorageSettings
,
:legacy_disk_path
,
deprecator:
deprecator
)
ActiveSupport
::
Deprecation
.
deprecate_methods
(
Gitlab
::
GitalyClient
::
StorageSettings
,
:legacy_disk_path
,
deprecator:
deprecator
)
end
end
lib/gitlab.rb
View file @
2c8d4f1a
...
@@ -3,21 +3,18 @@ require_dependency 'gitlab/git'
...
@@ -3,21 +3,18 @@ require_dependency 'gitlab/git'
module
Gitlab
module
Gitlab
COM_URL
=
'https://gitlab.com'
.
freeze
COM_URL
=
'https://gitlab.com'
.
freeze
APP_DIRS_PATTERN
=
%r{^/?(app|config|ee|lib|spec|
\(\w
*
\)
)}
APP_DIRS_PATTERN
=
%r{^/?(app|config|ee|lib|spec|
\(\w
*
\)
)}
SUBDOMAIN_REGEX
=
%r{
\A
https://[a-z0-9]+
\.
gitlab
\.
com
\z
}
def
self
.
com?
def
self
.
com?
# Check `
staging
?` as well to keep parity with gitlab.com
# Check `
gl_subdomain
?` as well to keep parity with gitlab.com
Gitlab
.
config
.
gitlab
.
url
==
COM_URL
||
staging
?
Gitlab
.
config
.
gitlab
.
url
==
COM_URL
||
gl_subdomain
?
end
end
def
self
.
staging
?
def
self
.
gl_subdomain
?
Gitlab
.
config
.
gitlab
.
url
==
'https://staging.gitlab.com'
SUBDOMAIN_REGEX
===
Gitlab
.
config
.
gitlab
.
url
end
end
def
self
.
dev?
def
self
.
dev_env_or_com?
Gitlab
.
config
.
gitlab
.
url
==
'https://dev.gitlab.org'
Rails
.
env
.
test?
||
Rails
.
env
.
development?
||
com?
end
def
self
.
inc_controlled?
dev?
||
staging?
||
com?
end
end
end
end
spec/lib/gitlab_spec.rb
View file @
2c8d4f1a
...
@@ -14,6 +14,12 @@ describe Gitlab do
...
@@ -14,6 +14,12 @@ describe Gitlab do
expect
(
described_class
.
com?
).
to
eq
true
expect
(
described_class
.
com?
).
to
eq
true
end
end
it
'is true when on other gitlab subdomain'
do
stub_config_setting
(
url:
'https://example.gitlab.com'
)
expect
(
described_class
.
com?
).
to
eq
true
end
it
'is false when not on GitLab.com'
do
it
'is false when not on GitLab.com'
do
stub_config_setting
(
url:
'http://example.com'
)
stub_config_setting
(
url:
'http://example.com'
)
...
...
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