Completed
Pull Request — develop (#132)
by Tony
03:18
created
app/Http/Requests/UpdateUserRequest.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
         if ($this->input('update') == 'password') {
57 57
             $user_id = $this->input('user_id');
58 58
             $rules = ['password'              => 'required|min:5|max:255',
59
-                      'password_confirmation' => 'required|same:password',
59
+                        'password_confirmation' => 'required|same:password',
60 60
             ];
61 61
             if (!Auth::user()->isAdmin() || Auth::id() == $user_id) {
62 62
                 $rules['current_password'] = 'required|password:'.$user_id;
Please login to merge, or discard this patch.
app/Console/Commands/MigrateSettings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
         }
70 70
 
71 71
         if (!$this->option('dry-run')) {
72
-            Settings::flush();  // clear the settings cache
72
+            Settings::flush(); // clear the settings cache
73 73
             DbConfig::updateOrCreate(['config_name' => 'settings.migrated'], ['config_value' => true]);
74 74
         }
75 75
     }
Please login to merge, or discard this patch.
app/Http/Controllers/SettingsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
             // remove entries with missing indexes
84 84
             $delete = array_diff_key($current, $new);
85 85
             foreach ($delete as $index => $value) {
86
-                Settings::forget($key . '.' . $index);
86
+                Settings::forget($key.'.'.$index);
87 87
             }
88 88
 
89 89
             Settings::set($key, $new);
Please login to merge, or discard this patch.