Merge branch 'remove-dead-js-and-align-with-ce' into 'master'

Remove dead code and align with some JS code from CE

Related to gitlab-org/gitlab-ce!7205.

See merge request !836

app/assets/javascripts/admin_email_select.js

@@ -14,7 +14,7 @@
             minimumInputLength: 0,
             query: function(query) {
               var group_result, project_result;
-              group_result = Api.groups(query.term, { skip_ldap: skip_ldap }, function(groups) {
+              group_result = Api.groups(query.term, {}, function(groups) {
                 return groups;
               });
               project_result = Api.projects(query.term, 'id', function(projects) {

app/assets/javascripts/groups_select.js

@@ -6,8 +6,7 @@
     function GroupsSelect() {
       $('.ajax-groups-select').each((function(_this) {
         return function(i, select) {
-          var skip_ldap, all_available, skip_groups;
-          skip_ldap = $(select).hasClass('skip_ldap');
+          var all_available, skip_groups;
           all_available = $(select).data('all-available');
           skip_groups = $(select).data('skip-groups') || [];
           return $(select).select2({
@@ -15,7 +14,7 @@
             multiple: $(select).hasClass('multiselect'),
             minimumInputLength: 0,
             query: function(query) {
-              options = { all_available: all_available, skip_groups: skip_groups }
+              options = { all_available: all_available, skip_groups: skip_groups };
               return Api.groups(query.term, options, function(groups) {
                 var data;
                 data = {

app/assets/javascripts/lib/utils/common_utils.js

@@ -36,9 +36,6 @@
         }
       });
     };
-    gl.utils.capitalize = function(str) {
-      return str[0].toUpperCase() + str.slice(1);
-    };
     gl.utils.getPagePath = function() {
       return $('body').data('page').split(':')[0];
     };

app/assets/javascripts/merge_request_widget.js.es6

@@ -106,7 +106,7 @@
               callback = function() {
                 return merge_request_widget.mergeInProgress(deleteSourceBranch);
               };
-              return setTimeout(callback, 1000);
+              return setTimeout(callback, 2000);
             }
           };
         })(this),
@@ -229,11 +229,11 @@
         if ($(`.mr-state-widget #${ environment.id }`).length) return;
         const $template = $(DEPLOYMENT_TEMPLATE);
         if (!environment.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove();
-        
+
         if (!environment.stop_url) {
           $('.js-stop-env-link', $template).remove();
         }
-        
+
         if (environment.deployed_at && environment.deployed_at_formatted) {
           environment.deployed_at = $.timeago(environment.deployed_at) + '.';
         } else {