diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-21 20:45:36 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-21 20:45:36 +0000 |
| commit | bdc4a9f290ae9624f7a1822e42e7fbf5288ca132 (patch) | |
| tree | e77298bb95c3d00435ef23998eb5dcee910e0486 | |
| parent | 8386d54f92ddb3860dac45d65fad6e158fed4063 (diff) | |
| parent | d0c5222de2c435f74ac7dfd99194afbd292f2dd2 (diff) | |
| download | gitlab-ce-bdc4a9f290ae9624f7a1822e42e7fbf5288ca132.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: |