summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-10-06 19:17:58 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-10-06 19:17:58 +0000
commitd6d295d40765280d7ba6dd510d2b74bc54ee5311 (patch)
tree30d97bcfe38b4e73b70cda81ea245d8ad101cd60 /CHANGELOG
parent6320192592f32519c07231480cbd669a71e78320 (diff)
parente23c1d88e2d20ffd5cadde6bb06148b9295461b5 (diff)
downloadgitlab-ce-d6d295d40765280d7ba6dd510d2b74bc54ee5311.tar.gz
Merge branch 'replace-bootstrap-caret' into 'master'
Replace bootstrap caret with fontawesome caret ## What does this MR do? 1. Replaces all occurrences of `.caret` with fontawesome's caret (`fa-caret-down` for most cases) 2. Remove `.caret` from CSS 3. Refactored pipeline graph toggle to display the correct fontawesome caret (Had to change some JavaScript for this) ## Are there points in the code the reviewer needs to double check? * Need to check if I missed any pages :disappointed_relieved: or for any side effects ## Why was this MR needed? Resolves UI inconsistency ## Screenshots (if relevant) Before (1 example out of many): ![Screen_Shot_2016-09-12_at_3.49.58_PM](/uploads/5eb93bbcc00412a5875e39302f4d8ba0/Screen_Shot_2016-09-12_at_3.49.58_PM.png) After: ![Screen_Shot_2016-09-12_at_3.49.48_PM](/uploads/9259a9ebfb0bd09b4cfd55674e9b8be4/Screen_Shot_2016-09-12_at_3.49.48_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21169 See merge request !6314
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0da60766e33..8a3e04b91c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ v 8.13.0 (unreleased)
- Add broadcast messages and alerts below sub-nav
- Better empty state for Groups view
- Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
+ - Replace bootstrap caret with fontawesome caret (ClemMakesApps)
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
- Add organization field to user profile
- Fix deploy status responsiveness error !6633