Merge branch 'master' into replace-fa-icons

# Conflicts:
#	js/content.js

Author: EpocDotFr

html/options.html

@@ -62,17 +62,6 @@
         <div class="pbs pll">
             <small class="txt-muted">This feature is automatically disabled if logged-out</small>
         </div>
-        <!--<div class="pts row">
-            <div class="w40p txt-center browser-style">
-                <input type="checkbox" id="enable_menu_to_hide_mrs_based_on_pipeline_status">
-            </div>
-            <div>
-                <label for="enable_menu_to_hide_mrs_based_on_pipeline_status">Enable menu allowing to hide Merge Requests based on their latest pipeline status</label>
-            </div>
-        </div>
-        <div class="pbs pll">
-            <small class="txt-muted">This feature is automatically disabled if the GitLab "pipeline" feature is disabled</small>
-        </div>-->
         <div class="txt-center pts pbs"><button type="submit" class="browser-style">Save preferences</button></div>
     </form>
 

js/content.js

@@ -203,7 +203,7 @@
          * Determines if the project do uses the Gitlab "pipeline" feature.
          */
         isPipelineFeatureEnabled() {
-            return false;// document.querySelector('.nav-sidebar .shortcuts-pipelines') ? true : false;
+            return document.querySelector('.nav-sidebar .shortcuts-pipelines') ? true : false;
         }
 
         /**
@@ -245,10 +245,6 @@
                 if (self.userAuthenticated && self.preferences.enable_button_to_toggle_wip_status) {
                     self.attachClickEventToToggleWipStatusButtons();
                 }
-
-                if (self.pipelineFeatureEnabled && self.preferences.enable_menu_to_hide_mrs_based_on_pipeline_status) {
-                    self.addHideMrsByPipelineStatusMenu();
-                }
             });
         }
 
@@ -602,28 +598,7 @@
                 '<use xlink:href="' this.getBaseIconsUrl + '/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#' + iconName + '"></use>' +
             '</svg>';
         }
-
-        addHideMrsByPipelineStatusMenu() {
-            let menu = '<div class="filter-dropdown-container d-flex flex-column flex-md-row">' +
-               '<div class="dropdown inline prepend-left-10">' +
-                    '<button class="btn btn-default dropdown-menu-toggle" data-display="static" data-toggle="dropdown" type="button">' +
-                        'Pipeline status <i aria-hidden="true" class="fa fa-chevron-down"></i>' +
-                    '</button>' +
-                    '<ul class="dropdown-menu dropdown-menu-right dropdown-menu-selectable">' +
-                       '<li>' +
-                          '<a class="" href="#">Passed</a>' +
-                          '<a class="is-active" href="#">Failed</a>' +
-                       '</li>' +
-                    '</ul>' +
-               '</div>' +
-            '</div>';
-
-            this.parseHtmlAndAppend(
-                document.querySelector('.filtered-search-block'),
-                menu
-            );
-        }
     }
 
     let cs = new ContentScript();
-}(this));
+}(this));

js/options.js

@@ -37,8 +37,6 @@
             this.jiraTicketLinkLabelTypeRadioButtons = Array.from(document.querySelectorAll('input[name="jira_ticket_link_label_type"]'));
 
             this.enableButtonToToggleWipStatusCheckbox = document.querySelector('input#enable_button_to_toggle_wip_status');
-
-            this.enableMenuToHideMrsBasedOnPipelineStatus = document.querySelector('input#enable_menu_to_hide_mrs_based_on_pipeline_status');
         }
 
         /**
@@ -69,9 +67,6 @@
 
                 self.enableButtonToToggleWipStatusCheckbox.checked = preferences.enable_button_to_toggle_wip_status;
                 self.enableButtonToToggleWipStatusCheckbox.dispatchEvent(new CustomEvent('change'));
-
-                self.enableMenuToHideMrsBasedOnPipelineStatus.checked = preferences.enable_menu_to_hide_mrs_based_on_pipeline_status;
-                self.enableMenuToHideMrsBasedOnPipelineStatus.dispatchEvent(new CustomEvent('change'));
             });
         }
 
@@ -122,10 +117,6 @@
             this.enableButtonToToggleWipStatusCheckbox.addEventListener('change', function() {
                 self.forceUserToEnableAtLeastOneFeatureIfNecessarily();
             });
-
-            this.enableMenuToHideMrsBasedOnPipelineStatus.addEventListener('change', function() {
-                self.forceUserToEnableAtLeastOneFeatureIfNecessarily();
-            });
         }
 
         /**
@@ -147,8 +138,7 @@
                     enable_jira_ticket_link: this.enableJiraTicketLinkCheckbox.checked,
                     base_jira_url: this.baseJiraUrlInput.value,
                     jira_ticket_link_label_type: jira_ticket_link_label_type,
-                    enable_button_to_toggle_wip_status: this.enableButtonToToggleWipStatusCheckbox.checked,
-                    enable_menu_to_hide_mrs_based_on_pipeline_status: this.enableMenuToHideMrsBasedOnPipelineStatus.checked
+                    enable_button_to_toggle_wip_status: this.enableButtonToToggleWipStatusCheckbox.checked
                 },
                 function() {
                     self.setSuccessfulVisualFeedbackOnSubmitButton();
@@ -183,8 +173,7 @@
             return !this.displaySourceAndTargetBranchesCheckbox.checked
                 && !this.enableButtonToCopyMrInfoCheckbox.checked
                 && !this.enableJiraTicketLinkCheckbox.checked
-                && !this.enableButtonToToggleWipStatusCheckbox.checked
-                && !this.enableMenuToHideMrsBasedOnPipelineStatus.checked;
+                && !this.enableButtonToToggleWipStatusCheckbox.checked;
         }
 
         /**

js/preferences.js

@@ -13,8 +13,7 @@
                 enable_jira_ticket_link: false,
                 base_jira_url: '',
                 jira_ticket_link_label_type: 'ticket_id',
-                enable_button_to_toggle_wip_status: true,
-                enable_menu_to_hide_mrs_based_on_pipeline_status: true
+                enable_button_to_toggle_wip_status: true
             };
         }