Lin Jen-Shin b04f95a2ed Merge remote-tracking branch 'upstream/master' into new-issue-by-email ... * upstream/master: (620 commits) Added '*.js.es6 gitlab-language=javascript' to .gitattributes Fix CI status icon link underline Update CHANGELOG after 8.10.1 Add CHANGELOG Add es6 gem Instrument Nokogiri parsing methods Fix backup restore Use project ID in repository cache to prevent stale data from persisting across projects Add iid to MR API response `WikiPage` should have a slug even when not persisted. ES6ify all the things! Make fork counter always clickable (!5463) Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" Fix CHANGELOG Add spec for dashes in paths Fix Error 500 when creating Wiki pages with hyphens or spaces Add links to the real markdown.md file for all GFM examples Remove magic comments from Ruby files (!5456) Ignore invalid trusted proxies in X-Forwarded-For header remove search_id for label dropdown filter ...		2016-07-26 14:51:52 +08:00
..
framework	Merge branch 'ie-dropdown-search-field' into 'master'	2016-07-25 21:09:36 +00:00
highlight	Merge branch 'diff-line-colors' into 'master'	2016-04-25 19:30:15 +00:00
mailers	Changed tr to be direct descendant	2016-07-21 11:18:40 +01:00
pages	Merge remote-tracking branch 'upstream/master' into new-issue-by-email	2016-07-26 14:51:52 +08:00
application.scss	Remove VideoJS and clean the integration	2016-07-20 11:36:42 +02:00
behaviors.scss	Enable SpaceBeforeBrace rule for SCSS Lint	2016-03-30 14:30:06 -06:00
framework.scss	Updated blank state for environments and deployments	2016-06-21 09:54:15 +01:00
notify.scss	Optimise email CSS for speed with Premailer	2016-06-07 12:33:19 +01:00
print.scss	Updated print style	2016-04-18 12:00:20 +01:00