summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Make sure that is no pending migrations in Gitlab::CurrentSettingsfix-buildDouglas Barbosa Alexandre2015-12-301-1/+3
* Use Gitlab::CurrentSettings for InfluxDBYorick Peterse2015-12-291-25/+11
* Write to InfluxDB directly via UDPYorick Peterse2015-12-296-13/+40
* Strip newlines from obfuscated SQLYorick Peterse2015-12-291-1/+1
* Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-291-0/+14
|\
| * reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-281-0/+14
* | Handle missing settings table for metricsYorick Peterse2015-12-281-6/+10
|/
* Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-281-8/+24
* Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-2812-0/+702
|\
| * Added host option for InfluxDBinfluxdbYorick Peterse2015-12-281-1/+2
| * Use String#delete for removing double quotesYorick Peterse2015-12-281-1/+1
| * Track object counts using the "allocations" GemYorick Peterse2015-12-172-3/+26
| * Support for instrumenting class hierarchiesYorick Peterse2015-12-171-0/+23
| * Only track method calls above a certain thresholdYorick Peterse2015-12-172-3/+9
| * Allow filtering of what methods to instrumentYorick Peterse2015-12-171-2/+17
| * Track location information as tagsYorick Peterse2015-12-172-12/+22
| * Replace double quotes when obfuscating SQLYorick Peterse2015-12-171-1/+9
| * Track object count types as tagsYorick Peterse2015-12-171-1/+3
| * Only instrument methods defined directlyYorick Peterse2015-12-171-3/+7
| * Added Instrumentation.configureYorick Peterse2015-12-171-0/+4
| * Methods for instrumenting multiple methodsYorick Peterse2015-12-171-0/+23
| * Proper method instrumentation for special symbolsYorick Peterse2015-12-171-4/+5
| * Use custom code for instrumenting method callsYorick Peterse2015-12-172-48/+31
| * Use string evaluation for method instrumentationYorick Peterse2015-12-172-9/+11
| * Improved last_relative_application_frame timingsYorick Peterse2015-12-171-5/+8
| * Storing of application metrics in InfluxDBYorick Peterse2015-12-1713-0/+594
* | Merge branch 'master' into mention-allDouwe Maan2015-12-242-4/+4
|\ \
| * \ Merge branch 'ldap-special-chars-fix' into 'master' Douwe Maan2015-12-242-4/+4
| |\ \
| | * | No mb_chars needed anymoreldap-special-chars-fixDouwe Maan2015-12-241-2/+2
| | * | Fix identity and user retrieval when special characters are usedPatricio Cano2015-12-222-3/+3
* | | | Only allow group/project members to mention `@all`Douwe Maan2015-12-241-7/+12
|/ / /
* | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-241-0/+9
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-2152-1986/+426
| |\ \ | | |/
| * | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-2026-262/+1230
| |\ \
| * \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-044-7/+14
| |\ \ \
| * | | | Fix GitlabV::isibilityLevel::level_name methodTomasz Maczukin2015-11-041-1/+1
| * | | | Move level_name resolving to Gitlan::VisibilityLevelTomasz Maczukin2015-11-031-0/+9
* | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+17
|\ \ \ \ \
| * | | | | add CAS authentication supporttduehr2015-12-141-0/+17
* | | | | | Merge branch 'git-version' into 'master' Douwe Maan2015-12-211-0/+4
|\ \ \ \ \ \
| * | | | | | Show git version on admin pageTrey Davis2015-12-151-0/+4
| |/ / / / /
* | | | | | Backport JIRA serviceDrew Blessing2015-12-181-1/+11
| |_|_|_|/ |/| | | |
* | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-169-12/+17
|\ \ \ \ \
| * | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1511-14/+19
| |/ / / /
* | | | | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1539-2047/+12
|/ / / /
* | | | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-142-2/+4
|\ \ \ \
| * | | | Fix specsKamil Trzcinski2015-12-111-1/+1
| * | | | Add runners tokenKamil Trzcinski2015-12-111-1/+1
| * | | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-112-2/+4
* | | | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-142-0/+82
|\ \ \ \ \ | |/ / / /