summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-buildsTomasz Maczukin2016-01-141-1/+1
* Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-146-10/+131
|\
| * Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-143-10/+31
| |\
| | * Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-142-8/+12
| | |\
| | | * fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-3/+1
| | | * Codestyle changesGabriel Mazetto2016-01-121-3/+3
| | | * Code style fixes and some code simplifiedGabriel Mazetto2016-01-081-1/+3
| | | * LDAP synchronization block/unblock new statesGabriel Mazetto2016-01-081-3/+3
| | | * Prevent ldap_blocked users from being blocked/unblocked by the APIGabriel Mazetto2016-01-081-4/+8
| | * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-139-40/+58
| | |\ \
| | * | | Ensure the API doesn't return notes that the current user shouldn't seeRémy Coutable2016-01-131-2/+19
| * | | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-1345-246/+598
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix some typosTomasz Maczukin2016-01-131-2/+2
| * | | | Add some fixes after reviewTomasz Maczukin2016-01-131-13/+16
| * | | | Remove blank lineTomasz Maczukin2016-01-121-1/+0
| * | | | Update ./doc/apiTomasz Maczukin2016-01-071-1/+1
| * | | | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-071-25/+16
| * | | | Fix a typo in method descriptionTomasz Maczukin2015-12-311-1/+1
| * | | | Add create feature to variables APITomasz Maczukin2015-12-311-0/+20
| * | | | Add missing 'not_found' checks in variables APITomasz Maczukin2015-12-311-0/+7
| * | | | Add delete feature to variables APITomasz Maczukin2015-12-311-0/+12
| * | | | Add update feature for variables APITomasz Maczukin2015-12-311-1/+20
| * | | | Add features for list and show details of variables in APITomasz Maczukin2015-12-313-0/+49
* | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1314-63/+101
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| |/ / / /
* | | | | Add some fixes after reviewTomasz Maczukin2016-01-132-15/+15
* | | | | Add some fixesTomasz Maczukin2016-01-122-2/+1
* | | | | Add TODO notice to build trace feature in CI APITomasz Maczukin2016-01-111-0/+4
* | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1126-81/+413
|\ \ \ \ \ | |/ / / /
| * | | | 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
View Lorry Controller Status