diff --git a/.scss-lint.yml b/.scss-lint.yml
index 5093702519bd0d51379d6e7f9c02e48b4f769dc6..89f9e74f03d0aaac0732ee5a834fb134a68a40e1 100644
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -223,7 +223,7 @@ linters:
 
   # Reports lines containing trailing whitespace.
   TrailingWhitespace:
-    enabled: false
+    enabled: true
 
   # Don't write trailing zeros for numeric values with a decimal point.
   TrailingZero:
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss
index 1e9a45c19b886e709bd8bc3d3fc09a812ac08d96..98d3889cd44b3b3c4c7ddc65fc02a2a4a5a4fdf7 100644
--- a/app/assets/stylesheets/framework/animations.scss
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -1,10 +1,10 @@
 // This file is based off animate.css 3.5.1, available here:
 // https://github.com/daneden/animate.css/blob/3.5.1/animate.css
-// 
+//
 // animate.css - http://daneden.me/animate
 // Version - 3.5.1
 // Licensed under the MIT license - http://opensource.org/licenses/MIT
-// 
+//
 // Copyright (c) 2016 Daniel Eden
 
 .animated {
diff --git a/app/assets/stylesheets/framework/logo.scss b/app/assets/stylesheets/framework/logo.scss
index a90e45bb5f4a6cc260ab1aa4f3e4fafa6f25a3cc..429cfbe72356ef55e3b804e7c1f44a466d42ddcd 100644
--- a/app/assets/stylesheets/framework/logo.scss
+++ b/app/assets/stylesheets/framework/logo.scss
@@ -61,7 +61,7 @@
         10%, 80% {
           fill: $tanuki-red;
         }
- 
+
         20%, 90% {
           fill: lighten($tanuki-red, 25%);
         }
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index d732008de3dd9761dccec0f2d618439a9c8514ab..572e1e7d558c4c7e65ccc99d14b90a1c26b2e541 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -9,15 +9,15 @@
       padding: 24px 0;
       border-bottom: none;
       position: relative;
-      
+
       @media (max-width: $screen-sm-min) {
         padding: 6px 0 24px;
-      } 
+      }
     }
 
     .column {
       text-align: center;
-      
+
       @media (max-width: $screen-sm-min) {
         padding: 15px 0;
       }
@@ -36,7 +36,7 @@
 
       &:last-child {
         text-align: right;
-        
+
         @media (max-width: $screen-sm-min) {
           text-align: center;
         }
@@ -51,7 +51,7 @@
   .bordered-box {
     border: 1px solid $border-color;
     border-radius: $border-radius-default;
-  
+
   }
 
   .content-list {
@@ -73,10 +73,10 @@
           font-weight: 600;
           color: $gl-title-color;
         }
-        
+
         &.text {
           color: $layout-link-gray;
-          
+
           &.value-col {
             color: $gl-title-color;
           }
@@ -108,13 +108,13 @@
 
     .svg-container {
       text-align: center;
-      
+
       svg {
         width: 136px;
         height: 136px;
       }
     }
-    
+
     .inner-content {
       @media (max-width: $screen-sm-min) {
         padding: 0 28px;
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index fe6421f8b3ffdfbf0946b6b939fc84b882fa4bae..f8e3ca29a2b0eef05262bbfdd1896c23a948f031 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -222,12 +222,12 @@
         top: 13px;
         right: 7px;
       }
- 
+
       .frame {
         top: 0;
         right: 0;
         position: absolute;
- 
+
         &.deleted {
           margin: 0;
           display: block;
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 12ee0a5dc3ddd437bcee6835060a8318651a7d60..fc49ff780fc591f4717dffa9a50944d9b10e8085 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -37,10 +37,10 @@
   .branch-name {
     color: $gl-dark-link-color;
   }
-  
+
   .stop-env-link {
     color: $table-text-gray;
-    
+
     .stop-env-icon {
       font-size: 14px;
     }
@@ -48,11 +48,11 @@
 
   .deployment {
     .build-column {
-    
+
       .build-link {
         color: $gl-dark-link-color;
       }
-      
+
       .avatar {
         float: none;
       }
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 5d9a76dac0535eaf7bebc1bc506c1e25ec62908f..3004959ff7bcdc69979ce02e12263e35825e793c 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -142,7 +142,7 @@
 .event-last-push {
   overflow: auto;
   width: 100%;
-  
+
   .event-last-push-text {
     @include str-truncated(100%);
     padding: 4px 0;
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index 8dac6ab999ee53b860e13e27049cc1597c6e4eba..2be9453aaeeabf8bc224d3c10281bd5fa92ae450 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -286,7 +286,7 @@
   .new_user {
     position: relative;
     padding-bottom: 35px;
-    
+
     @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
       .forgot-password {
         float: none !important;
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss
index eed2b0ab7ccc961d257d3bddb0be096ebcd89e74..2e917361b250eb27f387aff6048a1082e67b7fba 100644
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
@@ -254,7 +254,7 @@ $colors: (
         border-top: solid 2px $border-green-extra-light;
       }
     }
-    
+
     .editor {
       pre {
         height: 350px;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index fffcdc812a72f1a865d48c1a891105e31f20ff23..faa0fc82ca867bd129a942098636eb4c18f12c3a 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -458,7 +458,7 @@ ul.notes {
 .discussion-next-btn {
   svg {
     margin: 0;
-    
+
     path {
       fill: $gray-darkest;
     }
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index f1d53c7b8bc689779ee30dc827c1af938971f0f4..01426e28e92eab43272ebb3ef64e5e32cd1804ef 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -74,7 +74,7 @@
   .ci-status-icon-success_with_warning {
     color: $gl-warning;
   }
-  
+
   .ci-status-icon-running {
     color: $blue-normal;
   }
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 6ea7a2b5498bd08ad5b794fe95e8e21764d757fd..84dcd6835d5f5e46b0ca15e053e267e3ff28a11b 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -29,11 +29,11 @@
 
       .last-commit {
         @include str-truncated(506px);
-        
+
         @media (min-width: $screen-sm-max) and (max-width: $screen-md-max) {
           @include str-truncated(450px);
         }
-        
+
       }
 
       .commit-history-link-spacer {