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
Jérome Perrin
gitlab-ce
Commits
6fd13ab0
Commit
6fd13ab0
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/gitlabhq/gitlabhq
parents
07deb225
7e10d013
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
config/initializers/secret_token.rb
config/initializers/secret_token.rb
+3
-1
No files found.
config/initializers/1_settings.rb
View file @
6fd13ab0
class
Settings
<
Settingslogic
class
Settings
<
Settingslogic
source
"
#{
Rails
.
root
}
/config/gitlab.yml"
source
ENV
.
fetch
(
'GITLAB_CONFIG'
)
{
"
#{
Rails
.
root
}
/config/gitlab.yml"
}
namespace
Rails
.
env
namespace
Rails
.
env
class
<<
self
class
<<
self
...
...
This diff is collapsed.
Click to expand it.
config/initializers/secret_token.rb
View file @
6fd13ab0
...
@@ -9,7 +9,9 @@ require 'securerandom'
...
@@ -9,7 +9,9 @@ require 'securerandom'
def
find_secure_token
def
find_secure_token
token_file
=
Rails
.
root
.
join
(
'.secret'
)
token_file
=
Rails
.
root
.
join
(
'.secret'
)
if
File
.
exist?
token_file
if
ENV
.
key?
(
'SECRET_KEY_BASE'
)
ENV
[
'SECRET_KEY_BASE'
]
elsif
File
.
exist?
token_file
# Use the existing token.
# Use the existing token.
File
.
read
(
token_file
).
chomp
File
.
read
(
token_file
).
chomp
else
else
...
...
This diff is collapsed.
Click to expand it.
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