Skip to content

Commit 5ef6f10

Browse files
author
Renato Marinho
authored
Merge branch 'master' into feature/slack-notifications
2 parents 221312a + 0e1c86f commit 5ef6f10

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ DB_PASSWORD=XXXXX
156156
**Remember**: Create the database for GitScrum before run artisan command.
157157

158158
```
159-
php artisan migrate --seed
159+
php artisan migrate
160+
php artisan db:seed --class=SettingSeeder
160161
```
161162

162163
#### Github

app/Http/Controllers/Web/AuthController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Socialite;
1414
use Auth;
1515
use SocialiteProviders\Manager\Exception\InvalidArgumentException;
16+
use Session;
1617

1718
class AuthController extends Controller
1819
{

app/Http/Requests/IssueRequest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public function rules()
3232
{
3333
return [
3434
'title' => 'required|min:2|max:255',
35+
'sprint_id' => 'required|integer',
3536
];
3637
}
3738
/**
@@ -45,6 +46,7 @@ public function messages()
4546
'title.required' => trans('gitscrum.issue-cannot-be-blank'),
4647
'title.min' => trans('gitscrum.issue-must-be-at-least-2-characters'),
4748
'title.max' => trans('gitscrum.issue-must-be-between-2-and-255-characters'),
49+
'sprint_id.required' => trans('gitscrum.sprint-cannot-be-blank'),
4850
];
4951
}
5052

resources/lang/en/gitscrum.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,5 @@
190190
'save' => 'Save',
191191
'issue-status-updated' => '@:username updated the issue to: *:status*',
192192
'issue-assigned' => '@:assignedBy assigned an issue to: :assignedTo',
193+
'sprint-cannot-be-blank' => 'Sprint can not be blank',
193194
);

resources/lang/es/gitscrum.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'labels' => 'Etiquetas',
1818
'label' => 'Etiqueta',
1919
'profile' => 'Perfil',
20-
'cooperation' => 'Coopración',
20+
'cooperation' => 'Cooperación',
2121
'issues-done' => 'Issues completados',
2222
'commits' => 'Commits',
2323
'dashboard' => 'Panel de control',
@@ -191,4 +191,5 @@
191191
'save' => 'Guardar',
192192
'issue-status-updated' => '@:username actualizó el estado del issue a: *:status*',
193193
'issue-assigned' => '@:assignedBy asignó un issue a: :assignedTo',
194+
'sprint-cannot-be-blank' => 'El sprint no puede quedar vacío',
194195
);

0 commit comments

Comments
 (0)