summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add missing changelog entryMichi302/gitlab-ce-feature/detailed-user-endpointMichi3022016-01-051-0/+1
* Make single user API endpoint return Entities::User instead of Entities::User...Michi3022015-12-282-1/+8
* 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
| * Replace double quotes when obfuscating SQLYorick Peterse2015-12-172-1/+17
| * Track object count types as tagsYorick Peterse2015-12-172-2/+5
| * Instrument Gitlab::Shel and Gitlab::GitYorick Peterse2015-12-171-0/+12
| * Only instrument methods defined directlyYorick Peterse2015-12-172-3/+33
| * Added Instrumentation.configureYorick Peterse2015-12-172-1/+13
| * Methods for instrumenting multiple methodsYorick Peterse2015-12-172-5/+52
| * Proper method instrumentation for special symbolsYorick Peterse2015-12-171-4/+5
| * Use custom code for instrumenting method callsYorick Peterse2015-12-175-95/+47
| * Use string evaluation for method instrumentationYorick Peterse2015-12-174-13/+16
| * Improved last_relative_application_frame timingsYorick Peterse2015-12-171-5/+8
| * Storing of application metrics in InfluxDBYorick Peterse2015-12-1732-13/+1368
* | Merge branch 'environment-variables-in-the-app' into 'master' Dmitriy Zaporozhets2015-12-284-1/+56
|\ \
| * | Thanks Robert for the corrections in the environment variables docs.environment-variables-in-the-appSytse Sijbrandij2015-12-282-2/+2
| * | Add documentation and example file for environent variables.Sytse Sijbrandij2015-12-272-0/+54
| * | Use environment variables to configure GitLab.Sytse Sijbrandij2015-12-272-1/+2
* | | Merge branch 'disable-git-follow' into 'master' Dmitriy Zaporozhets2015-12-282-1/+4
|\ \ \
| * | | Disable --follow in `git log` to avoid loading duplicate commit data in infin...Stan Hu2015-12-252-1/+4
* | | | Merge branch 'rs-fix-shortcut-help' into 'master' Dmitriy Zaporozhets2015-12-283-12/+8
|\ \ \ \
| * | | | Fix the "Show all" link for the keyboard shortcut modalrs-fix-shortcut-helpRobert Speicher2015-12-273-12/+8
* | | | | Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-2811-10/+121
|\ \ \ \ \
| * | | | | Add documentation for using reCAPTCHAadd-recaptcha-supportStan Hu2015-12-273-1/+58
| * | | | | Make sign-up form retain fields after failed CAPTCHA testStan Hu2015-12-271-4/+5
| * | | | | Fix failed specStan Hu2015-12-271-1/+1
| * | | | | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-279-6/+59
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-bump-brakeman' into 'master' Dmitriy Zaporozhets2015-12-283-10/+16
|\ \ \ \ \
| * | | | | Prevent an XSS warning from the updated Brakemanrs-bump-brakemanRobert Speicher2015-12-271-1/+1
| * | | | | Bump brakeman to ~> 3.1.0Robert Speicher2015-12-272-9/+15
| | |/ / / | |/| | |
* | | | | Merge branch 'initscript-duplicate-update' into 'master' Sytse Sijbrandij2015-12-281-2/+0
|\ \ \ \ \
| * | | | | `update-init-script` was listed two times. removed one without explanation.Raymii2015-12-221-2/+0
* | | | | | Merge branch 'fix_frequently_emojis' into 'master' Valery Sizov2015-12-281-6/+7
|\ \ \ \ \ \
| * | | | | | Do not show frequently used emojis when emptyValery Sizov2015-12-281-6/+7
|/ / / / / /
* | | | | | Merge branch 'issue_4662' into 'master' Robert Speicher2015-12-281-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Precompile assets before running feature specs. #4662Rubén Dávila2015-12-281-0/+1
| |/ / / /
* | | | | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-2711-18/+66
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix specmention-allDouwe Maan2015-12-251-0/+2
View Lorry Controller Status