Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
Doorcode
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Guardians of the Kretschmar Elock System
Doorcode
Commits
850daccf
Commit
850daccf
authored
May 16, 2020
by
Jacob Priddy
👌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove soft deleting from users.
parent
49f00262
Pipeline
#8832
canceled with stages
in 1 minute and 12 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
5 deletions
+2
-5
src/web/backend/app/User.php
src/web/backend/app/User.php
+0
-2
src/web/backend/database/migrations/2014_10_12_000000_create_users_table.php
...abase/migrations/2014_10_12_000000_create_users_table.php
+1
-2
src/web/backend/src/Entities/User.php
src/web/backend/src/Entities/User.php
+1
-1
No files found.
src/web/backend/app/User.php
View file @
850daccf
...
...
@@ -9,8 +9,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
class
User
extends
Authenticatable
{
use
SoftDeletes
;
protected
$fillable
=
[
'*'
,
];
...
...
src/web/backend/database/migrations/2014_10_12_000000_create_users_table.php
View file @
850daccf
...
...
@@ -14,7 +14,7 @@ class CreateUsersTable extends Migration
public
function
up
()
{
// This table holds the user objects in the system
Schema
::
create
(
'users'
,
function
(
Blueprint
$table
)
{
Schema
::
create
(
'users'
,
static
function
(
Blueprint
$table
)
{
$table
->
id
();
$table
->
string
(
'first_name'
);
$table
->
string
(
'last_name'
);
...
...
@@ -27,7 +27,6 @@ class CreateUsersTable extends Migration
$table
->
string
(
'doorcode'
)
->
nullable
()
->
default
(
null
);
$table
->
timestamp
(
'expires_at'
)
->
nullable
();
$table
->
timestamps
();
$table
->
softDeletes
();
});
}
...
...
src/web/backend/src/Entities/User.php
View file @
850daccf
...
...
@@ -270,7 +270,7 @@ class User
public
function
is
(
?User
$user
):
bool
{
if
(
!
$user
)
{
return
null
;
return
false
;
}
return
$this
->
hasEmailOf
(
$user
);
...
...
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