Merge branch '201733-logs-search-simplify-callback' into 'master'

Remove unnecessary complex condition for submit

See merge request gitlab-org/gitlab!24579

ee/app/assets/javascripts/logs/components/environment_logs.vue

@@ -205,7 +205,7 @@ export default {
             class="js-logs-search"
             type="search"
             autofocus
-            @submit="!disableAdvancedControls && setSearch(searchQuery)"
+            @submit="setSearch(searchQuery)"
           />
         </gl-form-group>
       </div>

ee/spec/frontend/logs/components/environment_logs_spec.js

@@ -215,14 +215,7 @@ describe('EnvironmentLogs', () => {
     });
 
     it('displays a disabled search bar', () => {
-      expect(findSearchBar().exists()).toBe(true);
       expect(findSearchBar().attributes('disabled')).toBe('true');
-
-      // input a query and click `search`
-      findSearchBar().vm.$emit('input', mockSearch);
-      findSearchBar().vm.$emit('submit');
-
-      expect(actionMocks.setSearch).not.toHaveBeenCalled();
     });
   });