Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
phundament
app
Commits
2fbf01f3
Commit
2fbf01f3
authored
Mar 31, 2016
by
Tobias Munk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed new-line, removed file check
parent
2d5bccb0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
setup.sh
src/bin/setup.sh
+2
-1
main.php
src/config/main.php
+2
-5
No files found.
src/bin/setup.sh
View file @
2fbf01f3
...
...
@@ -10,4 +10,5 @@ yii db/create
yii migrate
--interactive
=
0
--migrationLookup
=
${
APP_MIGRATION_LOOKUP
}
yii app/setup-admin-user
--interactive
=
0
echo
"
\n
Application initialized."
echo
""
echo
"Application initialized."
src/config/main.php
View file @
2fbf01f3
...
...
@@ -243,11 +243,8 @@ if (YII_ENV_DEV || YII_ENV_TEST) {
'allowedIPs'
=>
$allowedIPs
,
];
if
(
file_exists
(
__DIR__
.
'/giiant.php'
))
{
// Local configuration, if available
$giiant
=
require
__DIR__
.
'/giiant.php'
;
$config
=
\yii\helpers\ArrayHelper
::
merge
(
$config
,
$giiant
);
}
$giiant
=
require
__DIR__
.
'/giiant.php'
;
$config
=
\yii\helpers\ArrayHelper
::
merge
(
$config
,
$giiant
);
}
if
(
file_exists
(
getenv
(
'APP_CONFIG_FILE'
)))
{
...
...
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