summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-132-5/+28
|\
| * Randomize metrics sample intervalsconfigure-randomize-metrics-sample-intervalYorick Peterse2016-01-131-3/+25
| * Make the metrics sampler interval configurableYorick Peterse2016-01-132-2/+3
* | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-132-3/+3
|\ \
| * | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-121-1/+1
| * | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some compl...Jason Lee2016-01-121-2/+2
* | | Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-132-6/+12
|\ \ \
| * | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-113-31/+16
| * | | Update ./doc/apiTomasz Maczukin2016-01-071-0/+9
| * | | Add ci fields in project create/update feature APITomasz Maczukin2016-01-052-4/+13
| * | | Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
* | | | Disable colorization if STDOUT is not a ttyRobert Speicher2016-01-121-0/+2
| |_|/ |/| |
* | | Merge branch 'remove-application-frames-from-views' into 'master' Yorick Peterse2016-01-122-23/+1
|\ \ \
| * | | Stop tracking call stacks for instrumented viewsremove-application-frames-from-viewsYorick Peterse2016-01-122-23/+1
| | |/ | |/|
* | | Track memory allocated during a transactionYorick Peterse2016-01-121-3/+12
|/ /
* | Merge branch 'optimize_ldap' into 'master' Douwe Maan2016-01-113-11/+25
|\ \
| * | Optimize LDAP and add a search timeoutDrew Blessing2016-01-113-11/+25
* | | Tag all transaction metrics with an "action" tagYorick Peterse2016-01-113-12/+18
|/ /
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-114-9/+15
|\ \
| * \ Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-083-9/+14
| |\ \
| | * | DRY up upload and download servicesapi-project-uploadDouwe Maan2016-01-081-1/+1
| | * | Satisfy RubocpDouwe Maan2016-01-071-1/+1
| | * | Add API project upload endpointDouwe Maan2016-01-073-9/+14
| * | | Merge branch 'suppress-allow-failure-builds' into 'master' Stan Hu2016-01-081-0/+1
| |\ \ \
| | * | | Suppress e-mails on failed builds if allow_failure is setStan Hu2016-01-071-0/+1
* | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-082-0/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'current-settings-handle-missing-db' into 'master' Yorick Peterse2016-01-081-0/+3
| |\ \ \ \
| | * | | | Handle missing DBs in connect_to_db?Yorick Peterse2016-01-081-0/+3
| | |/ / /
| * | | | Delete tag via APIapi-delete-tagRobert Schilling2016-01-081-0/+21
* | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-087-27/+61
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'task-list-class' into 'master' Robert Speicher2016-01-071-4/+9
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into task-list-classtask-list-classDouwe Maan2016-01-073-6/+8
| | |\ \ \ \ | | | |/ / /
| | * | | | Properly set task-list class on single item task listsDouwe Maan2016-01-071-4/+9
| | | |/ / | | |/| |
| * | | | Merge branch 'milestone-ref' into 'master' Robert Speicher2016-01-074-18/+45
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'master' into milestone-refDouwe Maan2016-01-062-2/+2
| | |\ \ \
| | * | | | Remove icon from milestone reference.Douwe Maan2016-01-051-2/+0
| | * | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-0525-31/+787
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-254-9/+15
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-244-5/+14
| | |\ \ \ \ \ \
| | * | | | | | | More escaping!Douwe Maan2015-12-242-5/+5
| | * | | | | | | Render milestone links as referencesDouwe Maan2015-12-244-18/+47
| | * | | | | | | Escape reference link textDouwe Maan2015-12-242-8/+11
| * | | | | | | | Merge branch 'remove-more-influxdb-tags' into 'master' Yorick Peterse2016-01-072-5/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Store request methods/URIs as valuesYorick Peterse2016-01-072-3/+7
| | * | | | | | | | Removed UUIDs from metrics transactionsYorick Peterse2016-01-071-3/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-075-21/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master' Dmitriy Zaporozhets2016-01-071-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Suggest prefacing find command with sudo when base permissions are wrongStan Hu2016-01-051-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Revert "Store SQL/view timings in milliseconds"Yorick Peterse2016-01-072-11/+3
| * | | | | | | Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-071-5/+1
| |\ \ \ \ \ \ \