summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/env_variables_for_emails' into 'master' jenkins-integration-fixSytse Sijbrandij2015-12-303-6/+9
|\
| * Added additional config environmental variables to help Debian packagingGabriel Mazetto2015-12-303-6/+9
|/
* Merge branch 'fix/missing-ci-build-traces' into 'master' Grzegorz Bizon2015-12-302-9/+57
|\
| * Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-tracesGrzegorz Bizon2015-12-292-9/+36
| * Hotfix for builds trace data integrityGrzegorz Bizon2015-12-281-1/+22
* | Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
|\ \
| * | Fix user autocomplete uriIgor Matsko2015-12-261-1/+1
* | | Merge branch 'fix-transfer-project-email' into 'master' Robert Speicher2015-12-292-1/+6
|\ \ \
| * | | Fix project transfer e-mail sending incorrect paths in e-mail notificationStan Hu2015-12-292-1/+6
|/ / /
* | | Update CHANGELOGRobert Speicher2015-12-291-4/+4
* | | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-296-23/+24
|\ \ \
| * | | note votes methids implementationupvote_count_to_apiValery Sizov2015-12-291-2/+2
| * | | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-286-21/+22
* | | | Merge branch 'influxdb-current-settings' into 'master' Yorick Peterse2015-12-291-25/+11
|\ \ \ \
| * | | | Use Gitlab::CurrentSettings for InfluxDBYorick Peterse2015-12-291-25/+11
|/ / / /
* | | | Merge branch 'influxdb-without-sidekiq' into 'master' Yorick Peterse2015-12-2919-155/+155
|\ \ \ \
| * | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-2918-155/+149
| * | | | Strip newlines from obfuscated SQLYorick Peterse2015-12-292-1/+7
* | | | | Merge branch 'issue_3780' into 'master' Dmitriy Zaporozhets2015-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
* | | | | Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-2913-71/+84
|\ \ \ \ \
| * | | | | When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settingsStan Hu2015-12-281-1/+1
| * | | | | reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-2813-71/+84
* | | | | | Merge branch 'fix-spelling-mistake' into 'master' Robert Speicher2015-12-292-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix spelling mistake, thanks Connor.fix-spelling-mistakeSytse Sijbrandij2015-12-282-4/+4
* | | | | | Merge branch 'influxdb-missing-settings' into 'master' Yorick Peterse2015-12-282-7/+11
|\ \ \ \ \ \
| * | | | | | Handle missing settings table for metricsYorick Peterse2015-12-282-7/+11
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix_link_permissions' into 'master' Achilleas Pipinellis2015-12-281-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix broken link in permissions page [ci skip]Achilleas Pipinellis2015-12-281-3/+3
* | | | | | Merge branch 'relocate-influxdb-settings' into 'master' Yorick Peterse2015-12-287-33/+122
|\ \ \ \ \ \
| * | | | | | Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-287-33/+122
* | | | | | | Merge branch 'fix-gitlab-yml-syntax' into 'master' Yorick Peterse2015-12-281-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fixed syntax in gitlab.yml.exampleYorick Peterse2015-12-281-1/+1
|/ / / / / /
* | | | | | Merge branch 'restart-settings-are-moved-too' into 'master' Dmitriy Zaporozhets2015-12-281-2/+2
|\ \ \ \ \ \
| * | | | | | Restart settings are moved too.Sytse Sijbrandij2015-12-281-2/+2
* | | | | | | Merge branch 'issue-weight-contributing' into 'master' Sytse Sijbrandij2015-12-281-0/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | add issue weight to contributingissue-weight-contributingJob van der Voort2015-12-281-0/+22
* | | | | | | Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-2831-12/+1693
|\ \ \ \ \ \ \
| * | | | | | | Added host option for InfluxDBinfluxdbYorick Peterse2015-12-282-1/+3
| * | | | | | | Fixed styling of MetricsWorker specsYorick Peterse2015-12-281-1/+1
| * | | | | | | Use String#delete for removing double quotesYorick Peterse2015-12-281-1/+1
| * | | | | | | Track object counts using the "allocations" GemYorick Peterse2015-12-175-3/+33
| * | | | | | | Instrument all ActiveRecord model methodsYorick Peterse2015-12-173-0/+23
| * | | | | | | Support for instrumenting class hierarchiesYorick Peterse2015-12-172-0/+56
| * | | | | | | Only track method calls above a certain thresholdYorick Peterse2015-12-174-3/+36
| * | | | | | | Allow filtering of what methods to instrumentYorick Peterse2015-12-172-2/+33
| * | | | | | | Drop empty tag values from metricsYorick Peterse2015-12-172-1/+13
| * | | | | | | Cast values to strings before escaping themYorick Peterse2015-12-172-1/+5
| * | | | | | | Track location information as tagsYorick Peterse2015-12-174-16/+32
| * | | | | | | Added specs for MetricsWorkerYorick Peterse2015-12-171-0/+40