delta/gitlab/gitlab-ce.git, branch hotfix/recaptcha

delta/gitlab/gitlab-ce.git, branch hotfix/recaptcha gitlab.com: gitlab-org/gitlab-ce.git Fix recaptcha specs 2015-12-29T20:59:24+00:00 Gabriel Mazetto gabriel@gitlab.com 2015-12-29T20:59:24+00:00 a727ea0b0e7745079c757208c6243ce2f93267e5

Merge branch 'upvote_count_to_api' into 'master' 2015-12-29T16:07:12+00:00 Valery Sizov valery@gitlab.com 2015-12-29T16:07:12+00:00 eeba266e3d45f2e82f84bd3aab85195c890efb89 Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212


Revert upvotes and downvotes params back to MR API

issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672

See merge request !2212

Merge branch 'influxdb-current-settings' into 'master' 2015-12-29T16:03:13+00:00 Yorick Peterse yorickpeterse@gmail.com 2015-12-29T16:03:13+00:00 a12517466b13150cc6631018b9a7e91ea534e3d9 See merge request !2239


See merge request !2239

Use Gitlab::CurrentSettings for InfluxDB 2015-12-29T14:49:12+00:00 Yorick Peterse yorickpeterse@gmail.com 2015-12-29T14:49:12+00:00 701e5de9108faa65a118e8822560d39fd8ea9996 This ensures we can still start up even when not connecting to a database.

This ensures we can still start up even when not connecting to a
database.

Merge branch 'influxdb-without-sidekiq' into 'master' 2015-12-29T14:40:51+00:00 Yorick Peterse yorickpeterse@gmail.com 2015-12-29T14:40:51+00:00 1dbf7284a9c478fad9d6062a6e022b23370ef23d See merge request !2238


See merge request !2238

Write to InfluxDB directly via UDP 2015-12-29T13:53:45+00:00 Yorick Peterse yorickpeterse@gmail.com 2015-12-29T12:40:42+00:00 620e7bb3d60c3685b494b26e256b793a47621da4 This removes the need for Sidekiq and any overhead/problems introduced by TCP. There are a few things to take into account: 1. When writing data to InfluxDB you may still get an error if the server becomes unavailable during the write. Because of this we're catching all exceptions and just ignore them (for now). 2. Writing via UDP apparently requires the timestamp to be in nanoseconds. Without this data either isn't written properly. 3. Due to the restrictions on UDP buffer sizes we're writing metrics one by one, instead of writing all of them at once.

This removes the need for Sidekiq and any overhead/problems introduced
by TCP. There are a few things to take into account:

1. When writing data to InfluxDB you may still get an error if the
   server becomes unavailable during the write. Because of this we're
   catching all exceptions and just ignore them (for now).
2. Writing via UDP apparently requires the timestamp to be in
   nanoseconds. Without this data either isn't written properly.
3. Due to the restrictions on UDP buffer sizes we're writing metrics one
   by one, instead of writing all of them at once.

Strip newlines from obfuscated SQL 2015-12-29T12:40:08+00:00 Yorick Peterse yorickpeterse@gmail.com 2015-12-29T12:40:08+00:00 03478e6d5b98a723fbb349dac2c8495f75909a08 Newlines aren't really needed and they may mess with InfluxDB's line protocol.

Newlines aren't really needed and they may mess with InfluxDB's line
protocol.

Merge branch 'issue_3780' into 'master' 2015-12-29T11:54:13+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2015-12-29T11:54:13+00:00 10491c38b0391408ec44140e3e449b0965230cc9 Downcased user or email search for avatar_icon. GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased. Closes #3780 See merge request !2234


Downcased user or email search for avatar_icon.

GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased.

Closes #3780 

See merge request !2234

Merge branch 'feature/recaptcha_settings' into 'master' 2015-12-29T09:39:54+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2015-12-29T09:39:54+00:00 58bc4b72d519d971be7c3eb80f174d9e22f2a1b2 Makes reCAPTCHA configurable through Application Settings screen Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab See merge request !2231


Makes reCAPTCHA configurable through Application Settings screen

Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab

See merge request !2231

note votes methids implementation 2015-12-29T08:11:20+00:00 Valery Sizov vsv2711@gmail.com 2015-12-29T08:11:20+00:00 d3807328d8ed9be2915f67708b093269bf0b1b9f