Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix recaptcha specshotfix/recaptcha | Gabriel Mazetto | 2015-12-29 | 1 | -1/+2 |
* | Merge branch 'upvote_count_to_api' into 'master' | Valery Sizov | 2015-12-29 | 6 | -23/+24 |
|\ | |||||
| * | note votes methids implementationupvote_count_to_api | Valery Sizov | 2015-12-29 | 1 | -2/+2 |
| * | Revert upvotes and downvotes params to MR API | Valery Sizov | 2015-12-28 | 6 | -21/+22 |
* | | Merge branch 'influxdb-current-settings' into 'master' | Yorick Peterse | 2015-12-29 | 1 | -25/+11 |
|\ \ | |||||
| * | | Use Gitlab::CurrentSettings for InfluxDB | Yorick Peterse | 2015-12-29 | 1 | -25/+11 |
|/ / | |||||
* | | Merge branch 'influxdb-without-sidekiq' into 'master' | Yorick Peterse | 2015-12-29 | 19 | -155/+155 |
|\ \ | |||||
| * | | Write to InfluxDB directly via UDP | Yorick Peterse | 2015-12-29 | 18 | -155/+149 |
| * | | Strip newlines from obfuscated SQL | Yorick Peterse | 2015-12-29 | 2 | -1/+7 |
* | | | Merge branch 'issue_3780' into 'master' | Dmitriy Zaporozhets | 2015-12-29 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Downcased user or email search for avatar_icon.issue_3780 | Stefan Kahlhöfer | 2015-12-28 | 1 | -1/+1 |
* | | | Merge branch 'feature/recaptcha_settings' into 'master' | Dmitriy Zaporozhets | 2015-12-29 | 13 | -71/+84 |
|\ \ \ | |||||
| * | | | When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settings | Stan Hu | 2015-12-28 | 1 | -1/+1 |
| * | | | reCAPTCHA is configurable through Admin Settings, no reload needed. | Gabriel Mazetto | 2015-12-28 | 13 | -71/+84 |
* | | | | Merge branch 'fix-spelling-mistake' into 'master' | Robert Speicher | 2015-12-29 | 2 | -4/+4 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix spelling mistake, thanks Connor.fix-spelling-mistake | Sytse Sijbrandij | 2015-12-28 | 2 | -4/+4 |
* | | | | Merge branch 'influxdb-missing-settings' into 'master' | Yorick Peterse | 2015-12-28 | 2 | -7/+11 |
|\ \ \ \ | |||||
| * | | | | Handle missing settings table for metrics | Yorick Peterse | 2015-12-28 | 2 | -7/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix_link_permissions' into 'master' | Achilleas Pipinellis | 2015-12-28 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix broken link in permissions page [ci skip] | Achilleas Pipinellis | 2015-12-28 | 1 | -3/+3 |
* | | | | Merge branch 'relocate-influxdb-settings' into 'master' | Yorick Peterse | 2015-12-28 | 7 | -33/+122 |
|\ \ \ \ | |||||
| * | | | | Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settings | Yorick Peterse | 2015-12-28 | 7 | -33/+122 |
* | | | | | Merge branch 'fix-gitlab-yml-syntax' into 'master' | Yorick Peterse | 2015-12-28 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fixed syntax in gitlab.yml.example | Yorick Peterse | 2015-12-28 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'restart-settings-are-moved-too' into 'master' | Dmitriy Zaporozhets | 2015-12-28 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Restart settings are moved too. | Sytse Sijbrandij | 2015-12-28 | 1 | -2/+2 |
* | | | | | Merge branch 'issue-weight-contributing' into 'master' | Sytse Sijbrandij | 2015-12-28 | 1 | -0/+22 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | add issue weight to contributingissue-weight-contributing | Job van der Voort | 2015-12-28 | 1 | -0/+22 |
* | | | | | Merge branch 'influxdb' into 'master' | Dmitriy Zaporozhets | 2015-12-28 | 31 | -12/+1693 |
|\ \ \ \ \ | |||||
| * | | | | | Added host option for InfluxDBinfluxdb | Yorick Peterse | 2015-12-28 | 2 | -1/+3 |
| * | | | | | Fixed styling of MetricsWorker specs | Yorick Peterse | 2015-12-28 | 1 | -1/+1 |
| * | | | | | Use String#delete for removing double quotes | Yorick Peterse | 2015-12-28 | 1 | -1/+1 |
| * | | | | | Track object counts using the "allocations" Gem | Yorick Peterse | 2015-12-17 | 5 | -3/+33 |
| * | | | | | Instrument all ActiveRecord model methods | Yorick Peterse | 2015-12-17 | 3 | -0/+23 |
| * | | | | | Support for instrumenting class hierarchies | Yorick Peterse | 2015-12-17 | 2 | -0/+56 |
| * | | | | | Only track method calls above a certain threshold | Yorick Peterse | 2015-12-17 | 4 | -3/+36 |
| * | | | | | Allow filtering of what methods to instrument | Yorick Peterse | 2015-12-17 | 2 | -2/+33 |
| * | | | | | Drop empty tag values from metrics | Yorick Peterse | 2015-12-17 | 2 | -1/+13 |
| * | | | | | Cast values to strings before escaping them | Yorick Peterse | 2015-12-17 | 2 | -1/+5 |
| * | | | | | Track location information as tags | Yorick Peterse | 2015-12-17 | 4 | -16/+32 |
| * | | | | | Added specs for MetricsWorker | Yorick Peterse | 2015-12-17 | 1 | -0/+40 |
| * | | | | | Replace double quotes when obfuscating SQL | Yorick Peterse | 2015-12-17 | 2 | -1/+17 |
| * | | | | | Track object count types as tags | Yorick Peterse | 2015-12-17 | 2 | -2/+5 |
| * | | | | | Instrument Gitlab::Shel and Gitlab::Git | Yorick Peterse | 2015-12-17 | 1 | -0/+12 |
| * | | | | | Only instrument methods defined directly | Yorick Peterse | 2015-12-17 | 2 | -3/+33 |
| * | | | | | Added Instrumentation.configure | Yorick Peterse | 2015-12-17 | 2 | -1/+13 |
| * | | | | | Methods for instrumenting multiple methods | Yorick Peterse | 2015-12-17 | 2 | -5/+52 |
| * | | | | | Proper method instrumentation for special symbols | Yorick Peterse | 2015-12-17 | 1 | -4/+5 |
| * | | | | | Use custom code for instrumenting method calls | Yorick Peterse | 2015-12-17 | 5 | -95/+47 |
| * | | | | | Use string evaluation for method instrumentation | Yorick Peterse | 2015-12-17 | 4 | -13/+16 |