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
20106778
Commit
20106778
authored
Jan 14, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-non-conflict
parents
7335dffb
3bf9b660
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
CHANGELOG
CHANGELOG
+1
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
lib/gitlab/current_settings.rb
lib/gitlab/current_settings.rb
+12
-1
No files found.
CHANGELOG
View file @
20106778
...
...
@@ -23,6 +23,7 @@ v 7.7.0
- Close standard input in Gitlab::Popen.popen
- Trigger GitLab CI when push tags
- When accept merge request - do merge using sidaekiq job
- Enable web signups by default
v 7.6.0
...
...
config/initializers/1_settings.rb
View file @
20106778
...
...
@@ -112,7 +112,7 @@ rescue ArgumentError # no user configured
'/home/'
+
Settings
.
gitlab
[
'user'
]
end
Settings
.
gitlab
[
'time_zone'
]
||=
nil
Settings
.
gitlab
[
'signup_enabled'
]
||=
fals
e
Settings
.
gitlab
[
'signup_enabled'
]
||=
tru
e
Settings
.
gitlab
[
'signin_enabled'
]
||=
true
if
Settings
.
gitlab
[
'signin_enabled'
].
nil?
Settings
.
gitlab
[
'restricted_visibility_levels'
]
=
Settings
.
send
(
:verify_constant_array
,
Gitlab
::
VisibilityLevel
,
Settings
.
gitlab
[
'restricted_visibility_levels'
],
[])
Settings
.
gitlab
[
'username_changing_enabled'
]
=
true
if
Settings
.
gitlab
[
'username_changing_enabled'
].
nil?
...
...
lib/gitlab/current_settings.rb
View file @
20106778
...
...
@@ -8,7 +8,7 @@ module Gitlab
else
fake_application_settings
end
rescue
ActiveRecord
::
NoDatabaseError
rescue
ActiveRecord
::
NoDatabaseError
,
database_adapter
.
constantize
::
Error
fake_application_settings
end
end
...
...
@@ -22,5 +22,16 @@ module Gitlab
sign_in_text:
Settings
.
extra
[
'sign_in_text'
],
)
end
# We need to check which database is setup
# but we cannot assume that the database exists already.
# Not checking this will break "rake gitlab:setup".
def
database_adapter
if
Rails
.
configuration
.
database_configuration
[
Rails
.
env
][
'adapter'
]
==
'mysql2'
"Mysql2"
else
"PG"
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