delta/gitlab/gitlab-ce.git/config/initializers, branch doc_refactor_issues_api

Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'

2016-01-13T14:21:32+00:00


Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL;

https://github.com/gitlabhq/gitlabhq/pull/9964

@DouweM

See merge request !2383

Revert "Remove the `:coffee` and `:coffeescript` Haml filters"

2016-01-12T21:30:38+00:00

This reverts commit ae7de2f8510d6d4b69120f168122e26d69dda256.

Use CGI.escape instead of URI.escape, because URI is obsoleted.

2016-01-12T10:20:03+00:00

ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc

Remove the `:coffee` and `:coffeescript` Haml filters

2016-01-12T02:48:20+00:00

See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897

Optimize LDAP and add a search timeout

2016-01-11T14:17:32+00:00

Add two custom Date/Time conversion formats

2016-01-08T01:01:08+00:00

Track total query/view timings in transactions

2016-01-04T11:14:36+00:00

Removed tracking of hostnames for metrics

2015-12-31T16:55:10+00:00

This isn't hugely useful and mostly wastes InfluxDB space. We can re-add
this whenever needed (but only once we really need it).

Removed tracking of raw SQL queries

2015-12-31T16:14:02+00:00

This particular setup had 3 problems:

1. Storing SQL queries as tags is very inefficient as InfluxDB ends up
   indexing every query (and they can get pretty large). Storing these
   as values instead means we can't always display the SQL as easily.
2. We already instrument ActiveRecord query methods, thus we already
   have timing information about database queries.
3. SQL obfuscation is difficult to get right and I'd rather not expose
   sensitive data by accident.

Added additional config environmental variables to help Debian packaging

2015-12-30T14:45:24+00:00

* GITLAB_EMAIL_FROM
* GITLAB_EMAIL_DISPLAY_NAME
* GITLAB_EMAIL_REPLY_TO