summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-08-04 12:30:27 +0200
committerRémy Coutable <remy@rymai.me>2016-08-04 12:30:27 +0200
commit8c8599a6056766313252e618e87b32456e26e10e (patch)
tree1457636b99ec7de29aebb603d3252cfee9f31846
parentd63263ee1c0477394cc370054ba93ae4f2a698dd (diff)
downloadgitlab-ce-8c8599a6056766313252e618e87b32456e26e10e.tar.gz
Remove CHANGELOG and fix typo
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--CHANGELOG1
-rw-r--r--doc/development/gotchas.md4
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 36e99a3d3b1..fa272755033 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,6 @@ v 8.11.0 (unreleased)
- Limit git rev-list output count to one in forced push check
- Retrieve rendered HTML from cache in one request
- Load project invited groups and members eagerly in ProjectTeam#fetch_members
- - Updated docs for CoffeeScript migration.
v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter)
diff --git a/doc/development/gotchas.md b/doc/development/gotchas.md
index fc52027ab94..159d5ce286d 100644
--- a/doc/development/gotchas.md
+++ b/doc/development/gotchas.md
@@ -41,10 +41,10 @@ Rubocop](https://gitlab.com/gitlab-org/gitlab-ce/blob/8-4-stable/.rubocop.yml#L9
[Exception]: http://stackoverflow.com/q/10048173/223897
-## Don't use inline CoffeeScript/Javascript in views
+## Don't use inline CoffeeScript/JavaScript in views
Using the inline `:coffee` or `:coffeescript` Haml filters comes with a
-performance overhead. Using inline Javascript is not a good way to structure your code and should be avoided.
+performance overhead. Using inline JavaScript is not a good way to structure your code and should be avoided.
_**Note:** We've [removed these two filters](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/hamlit.rb)
in an initializer._