diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-21 20:45:36 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-21 19:25:07 -0200 |
| commit | e25b31ac81eb9cbd4e6eefb24a1f83e735bd628d (patch) | |
| tree | 917ba19a61061103bee63666ce6ebe75ec7f60cb | |
| parent | 8c86a198b2950b59bab3d2bb158eede38c9717fd (diff) | |
| download | gitlab-ce-e25b31ac81eb9cbd4e6eefb24a1f83e735bd628d.tar.gz | |
Merge branch '25938-progress-bar-gone' into 'master'
Put back progress bar CSS
Closes #25938
See merge request !8237
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/25938-progress-bar-gone.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index 718dbbfea27..55bc325b858 100644 --- 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"; diff --git a/changelogs/unreleased/25938-progress-bar-gone.yml b/changelogs/unreleased/25938-progress-bar-gone.yml new file mode 100644 index 00000000000..841c4d445c6 --- /dev/null +++ b/changelogs/unreleased/25938-progress-bar-gone.yml @@ -0,0 +1,4 @@ +--- +title: Adds back CSS for progress-bars +merge_request: 8237 +author: |