Merge branch '25938-progress-bar-gone' into 'master'

Put back progress bar CSS Closes #25938 See merge request !8237

Merge branch '25938-progress-bar-gone' into 'master'
bdc4a9f2 · Fatih Acet · 8386d54f · d0c5222d · bdc4a9f2 · bdc4a9f2
Commit bdc4a9f2 authored 8 years ago by Fatih Acet
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -33,7 +33,7 @@
 @import "bootstrap/labels";
 @import "bootstrap/badges";
 @import "bootstrap/alerts";
-// @import "bootstrap/progress-bars";
+@import "bootstrap/progress-bars";
 @import "bootstrap/list-group";
 @import "bootstrap/wells";
 @import "bootstrap/close";

--- a/changelogs/unreleased/25938-progress-bar-gone.yml
+++ b/changelogs/unreleased/25938-progress-bar-gone.yml
+---
+title: Adds back CSS for progress-bars
+merge_request: 8237
+author: