summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \
| | * | | | | | | Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-061-5/+1
| * | | | | | | | Merge branch 'merge-when-build-succeeds-unchecked' into 'master' Robert Speicher2016-01-061-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-062-2/+2
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'rs-issue-1697' into 'master' Douwe Maan2016-01-061-0/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Define a limited set of filters for SingleLinePipeliners-issue-1697Robert Speicher2016-01-051-0/+16
| * | | | | | | | | Merge branch 'fix-banzai-cache' into 'master' Robert Speicher2016-01-061-14/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Revert "Temporarily disable Markdown caching"Douwe Maan2016-01-061-3/+1
| | * | | | | | | | Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue."Douwe Maan2016-01-061-14/+7
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Store SQL/view timings in millisecondsYorick Peterse2016-01-062-3/+11
* | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-06178-2001/+4823
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-065-22/+275
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Ensure that we're only importing local pull requestsDouglas Barbosa Alexandre2016-01-052-1/+9
| | * | | | | | | Generate separate comments when importing GitHub Issues into GitLabDouglas Barbosa Alexandre2016-01-055-72/+114
| | * | | | | | | Refactoring GithubImport::ImporterDouglas Barbosa Alexandre2016-01-053-61/+174
View Lorry Controller Status