Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
syncEnrollments
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yeray Santana Hualde
syncEnrollments
Commits
6db1e295
Commit
6db1e295
authored
Dec 05, 2014
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'config' into develop
parents
6dfafcc4
9309699d
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
16 additions
and
217 deletions
+16
-217
.env.example
.env.example
+1
-0
routes.php
app/Http/routes.php
+3
-3
app.php
config/app.php
+1
-1
cache.php
config/cache.php
+1
-1
app.php
config/local/app.php
+0
-18
database.php
config/local/database.php
+0
-47
mail.php
config/local/mail.php
+0
-98
.gitkeep
config/packages/.gitkeep
+0
-0
queue.php
config/queue.php
+1
-1
session.php
config/session.php
+1
-1
cache.php
config/testing/cache.php
+0
-20
session.php
config/testing/session.php
+0
-21
phpunit.xml
phpunit.xml
+2
-0
app.blade.php
resources/views/app.blade.php
+0
-0
login.blade.php
resources/views/auth/login.blade.php
+1
-1
password.blade.php
resources/views/auth/password.blade.php
+1
-1
register.blade.php
resources/views/auth/register.blade.php
+1
-1
reset.blade.php
resources/views/auth/reset.blade.php
+1
-1
home.blade.php
resources/views/home.blade.php
+1
-1
welcome.blade.php
resources/views/welcome.blade.php
+1
-1
No files found.
.env.example
View file @
6db1e295
APP_ENV=local
APP_ENV=local
APP_DEBUG=true
APP_KEY=SomeRandomString
APP_KEY=SomeRandomString
DB_USERNAME=homestead
DB_USERNAME=homestead
DB_PASSWORD=homestead
DB_PASSWORD=homestead
app/Http/routes.php
View file @
6db1e295
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
|
|
*/
*/
$router
->
get
(
'/'
,
'WelcomeController@index'
);
Route
::
get
(
'/'
,
'WelcomeController@index'
);
$router
->
get
(
'/
home'
,
'HomeController@index'
);
Route
::
get
(
'
home'
,
'HomeController@index'
);
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
...
@@ -26,7 +26,7 @@ $router->get('/home', 'HomeController@index');
...
@@ -26,7 +26,7 @@ $router->get('/home', 'HomeController@index');
|
|
*/
*/
$router
->
controllers
([
Route
::
controllers
([
'auth'
=>
'Auth\AuthController'
,
'auth'
=>
'Auth\AuthController'
,
'password'
=>
'Auth\PasswordController'
,
'password'
=>
'Auth\PasswordController'
,
]);
]);
config/app.php
View file @
6db1e295
...
@@ -13,7 +13,7 @@ return [
...
@@ -13,7 +13,7 @@ return [
|
|
*/
*/
'debug'
=>
false
,
'debug'
=>
(
bool
)
getenv
(
'APP_DEBUG'
)
?:
false
,
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
...
...
config/cache.php
View file @
6db1e295
...
@@ -15,7 +15,7 @@ return [
...
@@ -15,7 +15,7 @@ return [
|
|
*/
*/
'driver'
=>
'file'
,
'driver'
=>
getenv
(
'CACHE_DRIVER'
)
?:
'file'
,
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
...
...
config/local/app.php
deleted
100644 → 0
View file @
6dfafcc4
<?php
return
[
/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/
'debug'
=>
true
,
];
config/local/database.php
deleted
100644 → 0
View file @
6dfafcc4
<?php
return
[
/*
|--------------------------------------------------------------------------
| Database Connections
|--------------------------------------------------------------------------
|
| Here are each of the database connections setup for your application.
| Of course, examples of configuring each database platform that is
| supported by Laravel is shown below to make development simple.
|
|
| All database work in Laravel is done through the PHP PDO facilities
| so make sure you have the driver for your particular database of
| choice installed on your machine before you begin development.
|
*/
'connections'
=>
[
'mysql'
=>
[
'driver'
=>
'mysql'
,
'host'
=>
'localhost'
,
'database'
=>
'homestead'
,
'username'
=>
'homestead'
,
'password'
=>
'secret'
,
'charset'
=>
'utf8'
,
'collation'
=>
'utf8_unicode_ci'
,
'prefix'
=>
''
,
],
'pgsql'
=>
[
'driver'
=>
'pgsql'
,
'host'
=>
'localhost'
,
'database'
=>
'homestead'
,
'username'
=>
'homestead'
,
'password'
=>
'secret'
,
'charset'
=>
'utf8'
,
'prefix'
=>
''
,
'schema'
=>
'public'
,
],
],
];
config/local/mail.php
deleted
100644 → 0
View file @
6dfafcc4
<?php
return
[
/*
|--------------------------------------------------------------------------
| Mail Driver
|--------------------------------------------------------------------------
|
| Laravel supports both SMTP and PHP's "mail" function as drivers for the
| sending of e-mail. You may specify which one you're using throughout
| your application here. By default, Laravel is setup for SMTP mail.
|
| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log"
|
*/
'driver'
=>
'smtp'
,
/*
|--------------------------------------------------------------------------
| SMTP Host Address
|--------------------------------------------------------------------------
|
| Here you may provide the host address of the SMTP server used by your
| applications. A default option is provided that is compatible with
| the Mailgun mail service which will provide reliable deliveries.
|
*/
'host'
=>
'mailtrap.io'
,
/*
|--------------------------------------------------------------------------
| SMTP Host Port
|--------------------------------------------------------------------------
|
| This is the SMTP port used by your application to deliver e-mails to
| users of the application. Like the host we have set this value to
| stay compatible with the Mailgun e-mail application by default.
|
*/
'port'
=>
465
,
/*
|--------------------------------------------------------------------------
| Global "From" Address
|--------------------------------------------------------------------------
|
| You may wish for all e-mails sent by your application to be sent from
| the same address. Here, you may specify a name and address that is
| used globally for all e-mails that are sent by your application.
|
*/
'from'
=>
[
'address'
=>
'homestead@laravel.com'
,
'name'
=>
'Homestead'
],
/*
|--------------------------------------------------------------------------
| E-Mail Encryption Protocol
|--------------------------------------------------------------------------
|
| Here you may specify the encryption protocol that should be used when
| the application send e-mail messages. A sensible default using the
| transport layer security protocol should provide great security.
|
*/
'encryption'
=>
'tls'
,
/*
|--------------------------------------------------------------------------
| SMTP Server Username
|--------------------------------------------------------------------------
|
| If your SMTP server requires a username for authentication, you should
| set it here. This will get used to authenticate with your server on
| connection. You may also set the "password" value below this one.
|
*/
'username'
=>
''
,
/*
|--------------------------------------------------------------------------
| SMTP Server Password
|--------------------------------------------------------------------------
|
| Here you may set the password required by your SMTP server to send out
| messages from your application. This will be given to the server on
| connection so that the application will be able to send messages.
|
*/
'password'
=>
''
,
];
config/packages/.gitkeep
deleted
100644 → 0
View file @
6dfafcc4
config/queue.php
View file @
6db1e295
...
@@ -15,7 +15,7 @@ return [
...
@@ -15,7 +15,7 @@ return [
|
|
*/
*/
'default'
=>
'sync'
,
'default'
=>
getenv
(
'QUEUE_DRIVER'
)
?:
'sync'
,
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
...
...
config/session.php
View file @
6db1e295
...
@@ -16,7 +16,7 @@ return [
...
@@ -16,7 +16,7 @@ return [
|
|
*/
*/
'driver'
=>
'file'
,
'driver'
=>
getenv
(
'SESSION_DRIVER'
)
?:
'file'
,
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
...
...
config/testing/cache.php
deleted
100644 → 0
View file @
6dfafcc4
<?php
return
[
/*
|--------------------------------------------------------------------------
| Default Cache Driver
|--------------------------------------------------------------------------
|
| This option controls the default cache "driver" that will be used when
| using the Caching library. Of course, you may use other drivers any
| time you wish. This is the default when another is not specified.
|
| Supported: "file", "database", "apc", "memcached", "redis", "array"
|
*/
'driver'
=>
'array'
,
];
config/testing/session.php
deleted
100644 → 0
View file @
6dfafcc4
<?php
return
[
/*
|--------------------------------------------------------------------------
| Default Session Driver
|--------------------------------------------------------------------------
|
| This option controls the default session "driver" that will be used on
| requests. By default, we will use the lightweight native driver but
| you may specify any of the other wonderful drivers provided here.
|
| Supported: "native", "cookie", "database", "apc",
| "memcached", "redis", "array"
|
*/
'driver'
=>
'array'
,
];
phpunit.xml
View file @
6db1e295
...
@@ -16,5 +16,7 @@
...
@@ -16,5 +16,7 @@
</testsuites>
</testsuites>
<php>
<php>
<env
name=
"APP_ENV"
value=
"testing"
/>
<env
name=
"APP_ENV"
value=
"testing"
/>
<env
name=
"CACHE_DRIVER"
value=
"array"
/>
<env
name=
"SESSION_DRIVER"
value=
"array"
/>
</php>
</php>
</phpunit>
</phpunit>
resources/views/
layouts/
app.blade.php
→
resources/views/app.blade.php
View file @
6db1e295
File moved
resources/views/auth/login.blade.php
View file @
6db1e295
@
extends
(
'
layouts.
app'
)
@
extends
(
'app'
)
@
section
(
'content'
)
@
section
(
'content'
)
<
div
class
="
container
">
<
div
class
="
container
">
...
...
resources/views/auth/password.blade.php
View file @
6db1e295
@
extends
(
'
layouts.
app'
)
@
extends
(
'app'
)
@
section
(
'content'
)
@
section
(
'content'
)
<
div
class
="
container
">
<
div
class
="
container
">
...
...
resources/views/auth/register.blade.php
View file @
6db1e295
@
extends
(
'
layouts.
app'
)
@
extends
(
'app'
)
@
section
(
'content'
)
@
section
(
'content'
)
<
div
class
="
container
">
<
div
class
="
container
">
...
...
resources/views/auth/reset.blade.php
View file @
6db1e295
@
extends
(
'
layouts.
app'
)
@
extends
(
'app'
)
@
section
(
'content'
)
@
section
(
'content'
)
<
div
class
="
container
">
<
div
class
="
container
">
...
...
resources/views/home.blade.php
View file @
6db1e295
@
extends
(
'
layouts.
app'
)
@
extends
(
'app'
)
@
section
(
'content'
)
@
section
(
'content'
)
<
div
class
="
container
">
<
div
class
="
container
">
...
...
resources/views/welcome.blade.php
View file @
6db1e295
@
extends
(
'
layouts.
app'
)
@
extends
(
'app'
)
@
section
(
'content'
)
@
section
(
'content'
)
<
div
id
=
"welcome"
>
<
div
id
=
"welcome"
>
...
...
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