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
06f159f9
Commit
06f159f9
authored
Jun 01, 2018
by
Balasankar "Balu" C
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename to INSTALLATION_TYPE
parent
12c1dce5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
3 deletions
+3
-3
INSTALLATION_TYPE
INSTALLATION_TYPE
+0
-0
lib/gitlab.rb
lib/gitlab.rb
+1
-1
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+1
-1
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+1
-1
No files found.
TYPE
→
INSTALLATION_
TYPE
View file @
06f159f9
File moved
lib/gitlab.rb
View file @
06f159f9
...
...
@@ -33,7 +33,7 @@ module Gitlab
APP_DIRS_PATTERN
=
%r{^/?(app|config|ee|lib|spec|
\(\w
*
\)
)}
SUBDOMAIN_REGEX
=
%r{
\A
https://[a-z0-9]+
\.
gitlab
\.
com
\z
}
VERSION
=
File
.
read
(
root
.
join
(
"VERSION"
)).
strip
.
freeze
TYPE
=
File
.
read
(
root
.
join
(
"
TYPE"
)).
strip
.
freeze
INSTALLATION_TYPE
=
File
.
read
(
root
.
join
(
"INSTALLATION_
TYPE"
)).
strip
.
freeze
def
self
.
com?
# Check `gl_subdomain?` as well to keep parity with gitlab.com
...
...
lib/gitlab/usage_data.rb
View file @
06f159f9
...
...
@@ -21,7 +21,7 @@ module Gitlab
uuid:
Gitlab
::
CurrentSettings
.
uuid
,
hostname:
Gitlab
.
config
.
gitlab
.
host
,
version:
Gitlab
::
VERSION
,
installation_type:
Gitlab
::
TYPE
,
installation_type:
Gitlab
::
INSTALLATION_
TYPE
,
active_user_count:
User
.
active
.
count
,
recorded_at:
Time
.
now
,
mattermost_enabled:
Gitlab
.
config
.
mattermost
.
enabled
,
...
...
spec/lib/gitlab/usage_data_spec.rb
View file @
06f159f9
...
...
@@ -191,7 +191,7 @@ describe Gitlab::UsageData do
expect
(
subject
[
:license_id
]).
to
eq
(
license
.
license_id
)
expect
(
subject
[
:version
]).
to
eq
(
Gitlab
::
VERSION
)
expect
(
subject
[
:licensee
]).
to
eq
(
license
.
licensee
)
expect
(
subject
[
:installation_type
]).
to
eq
(
Gitlab
::
TYPE
)
expect
(
subject
[
:installation_type
]).
to
eq
(
Gitlab
::
INSTALLATION_
TYPE
)
expect
(
subject
[
:active_user_count
]).
to
eq
(
User
.
active
.
count
)
expect
(
subject
[
:licensee
]).
to
eq
(
license
.
licensee
)
expect
(
subject
[
:license_user_count
]).
to
eq
(
license
.
restricted_user_count
)
...
...
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