summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-10 18:43:33 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-10 18:43:33 +0100
commit8ecc6f94cbcf462a2e1efc38769228a3c12c8735 (patch)
tree727ed1dcda9fc0e2918073e795d4313a3793057a
parent316dd9c8d6bd9ac5c3d35d08e61c299bc9ff7af7 (diff)
parent20b0ad2b0ff9ddc118bbdcb67a0916d6a693a137 (diff)
downloadgitlab-ce-8ecc6f94cbcf462a2e1efc38769228a3c12c8735.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/framework/typography.scss1
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 168c4b50e4a..b2693185368 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.2.0 (unreleased)
+ - Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
- Added a GitLab specific profiling tool called "Sherlock" (see GitLab CE merge request #1749)
- Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3 (Stan Hu)
- Improved performance of finding users by one of their Email addresses
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index e6558a23858..ba0312ba0db 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -173,7 +173,6 @@
*
*/
body {
- text-rendering:optimizeLegibility;
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}