Completed
Push — master ( 9d3bbf...ed7dc7 )
by Glenn
02:43
created
app/Http/Controllers/DepartmentController.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
      * Store a newly created resource in storage.
50 50
      *
51 51
      * @param  Requests\DepartmentsValidator $input
52
-     * @return \Illuminate\Http\Response
52
+     * @return \Illuminate\Http\RedirectResponse
53 53
      */
54 54
     public function store(Requests\DepartmentsValidator $input)
55 55
     {
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
      *
87 87
      * @param  Requests\DepartmentsValidator $input
88 88
      * @param  int $id the department id in the database.
89
-     * @return \Illuminate\Http\Response
89
+     * @return \Illuminate\Http\RedirectResponse
90 90
      */
91 91
     public function update(Requests\DepartmentsValidator $input, $id)
92 92
     {
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
      * Remove the specified resource from storage.
99 99
      *
100 100
      * @param  int  $id the department id in the database.
101
-     * @return \Illuminate\Http\Response
101
+     * @return \Illuminate\Http\RedirectResponse
102 102
      */
103 103
     public function destroy($id)
104 104
     {
Please login to merge, or discard this patch.
app/Http/routes.php 1 patch
Doc Comments   -11 removed lines patch added patch discarded remove patch
@@ -67,14 +67,3 @@
 block discarded – undo
67 67
 // Roles routes
68 68
 Route::get('/roles', 'RolesController@index')->name('roles');
69 69
 <<<<<<< HEAD
70
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
71
-=======
72
-<<<<<<< HEAD
73
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
74
-=======
75
-Route::post('/roles', 'RolesController@store')->name('roles.store');
76
->>>>>>> master
77
->>>>>>> development
78
-
79
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
80
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');
Please login to merge, or discard this patch.