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
5b08ff0b
Commit
5b08ff0b
authored
Oct 14, 2015
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into develop
parents
b1b33c85
421c0d0a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
AuthServiceProvider.php
app/Providers/AuthServiceProvider.php
+1
-1
broadcasting.php
config/broadcasting.php
+3
-0
database.php
config/database.php
+1
-1
phpunit.xml
phpunit.xml
+1
-2
No files found.
app/Providers/AuthServiceProvider.php
View file @
5b08ff0b
...
...
@@ -24,7 +24,7 @@ class AuthServiceProvider extends ServiceProvider
*/
public
function
boot
(
GateContract
$gate
)
{
parent
::
registerPolicies
(
$gate
);
$this
->
registerPolicies
(
$gate
);
//
}
...
...
config/broadcasting.php
View file @
5b08ff0b
...
...
@@ -33,6 +33,9 @@ return [
'key'
=>
env
(
'PUSHER_KEY'
),
'secret'
=>
env
(
'PUSHER_SECRET'
),
'app_id'
=>
env
(
'PUSHER_APP_ID'
),
'options'
=>
[
//
],
],
'redis'
=>
[
...
...
config/database.php
View file @
5b08ff0b
...
...
@@ -48,7 +48,7 @@ return [
'sqlite'
=>
[
'driver'
=>
'sqlite'
,
'database'
=>
storag
e_path
(
'database.sqlite'
),
'database'
=>
databas
e_path
(
'database.sqlite'
),
'prefix'
=>
''
,
],
...
...
phpunit.xml
View file @
5b08ff0b
...
...
@@ -7,8 +7,7 @@
convertNoticesToExceptions=
"true"
convertWarningsToExceptions=
"true"
processIsolation=
"false"
stopOnFailure=
"false"
syntaxCheck=
"false"
>
stopOnFailure=
"false"
>
<testsuites>
<testsuite
name=
"Application Test Suite"
>
<directory>
./tests/
</directory>
...
...
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