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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
575302c1
Commit
575302c1
authored
Apr 24, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not preload settings
parent
17ffd998
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
3 deletions
+4
-3
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
config/initializers/2_gitlab.rb
config/initializers/2_gitlab.rb
+1
-0
config/settings.rb
config/settings.rb
+0
-0
lib/gitlab.rb
lib/gitlab.rb
+0
-1
spec/fast_spec_helper.rb
spec/fast_spec_helper.rb
+2
-1
No files found.
config/initializers/1_settings.rb
View file @
575302c1
require_
dependency
File
.
expand_path
(
'../../lib/gitlab'
,
__dir__
)
# Load Gitlab as soon as possible
require_
relative
'../settings'
# Default settings
Settings
[
'ldap'
]
||=
Settingslogic
.
new
({})
...
...
config/initializers/2_gitlab.rb
0 → 100644
View file @
575302c1
require_relative
'../../lib/gitlab'
lib
/settings.rb
→
config
/settings.rb
View file @
575302c1
File moved
lib/gitlab.rb
View file @
575302c1
require_dependency
'settings'
require_dependency
'gitlab/popen'
module
Gitlab
...
...
spec/fast_spec_helper.rb
View file @
575302c1
...
...
@@ -9,7 +9,8 @@ unless Object.respond_to?(:require_dependency)
end
end
# Defines Gitlab and Gitlab.config which are at the center of the app
# Defines Settings and Gitlab.config which are at the center of the app
require_relative
'../config/settings'
require_relative
'../lib/gitlab'
unless
defined?
(
Gitlab
.
config
)
require_relative
'support/rspec'
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