summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a new total_count_with_limit to Kaminari's methods52674-api-v4-projects-project_id-jobs-endpoint-hits-statement-timeoutRémy Coutable2019-01-153-28/+48
* [API] Omit X-Total{,-Pages} when count > 10kRémy Coutable2019-01-154-3/+86
* Merge branch 'twang2218/gitlab-ce-i18n-extract-app/views/search' into 'master'Lin Jen-Shin2019-01-1513-40/+95
|\
| * [i18n] Externalize strings from 'app/views/search'Tao Wang2019-01-1513-40/+95
* | Merge branch '44780-wiki-page-with-a-dot-inside-title-slug-leads-to-404-in-th...Douwe Maan2019-01-154-4/+11
|\ \
| * | API: Support dots in wiki slugsRobert Schilling2019-01-154-4/+11
* | | Merge branch 'sh-suppress-duplicate-remote-mirror-notifications' into 'master'Douwe Maan2019-01-157-3/+91
|\ \ \
| * | | Only send one notification for failed remote mirrorStan Hu2019-01-157-3/+91
* | | | Merge branch 'sh-fix-backfill-project-repo-migration' into 'master'Douwe Maan2019-01-154-6/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | Cleanup dead code and commentsToon Claes2019-01-112-20/+5
| * | | Fix failing spec with orphaned namespaceToon Claes2019-01-112-2/+2
| * | | Load all projects, namespaces, routes in 1 queryToon Claes2019-01-112-10/+31
| * | | Fix duplicate disk path in Backfill ProjectReposStan Hu2019-01-112-3/+24
* | | | Merge branch '55945-suggested-change-preview-highlight' into 'master'Kushal Pandya2019-01-1510-6/+28
|\ \ \ \
| * | | | Add syntax highlighting to suggestion previewJacques Erasmus2019-01-1510-6/+28
|/ / / /
* | | | Merge branch 'docs/guidance-for-four-backticks' into 'master'Achilleas Pipinellis2019-01-151-0/+6
|\ \ \ \
| * | | | Document four backticks feature in markdownEvan Read2019-01-151-0/+6
|/ / / /
* | | | Merge branch 'sh-fix-project-mirrors-mix-http-ssh-creds-ce' into 'master'Nick Thomas2019-01-152-0/+15
|\ \ \ \
| * | | | Add clear_credentials method to ProjectImportDataStan Hu2019-01-142-0/+15
* | | | | Merge branch 'tz-improve-navigation-initialisation' into 'master'Phil Hughes2019-01-153-38/+56
|\ \ \ \ \
| * | | | | Optimization of setup of Main Nav Layout, Contextual Sidebar and Fly Out NavTim Zallmann2019-01-153-38/+56
|/ / / / /
* | | | | Merge branch 'backstage/gb/refactor-only-except-policies-config' into 'master'Kamil Trzciński2019-01-1513-39/+64
|\ \ \ \ \
| * | | | | Simplify code related to setting default config valuesGrzegorz Bizon2019-01-153-4/+6
| * | | | | Make default config entry value configurableGrzegorz Bizon2019-01-1511-55/+33
| * | | | | Fix specs related to emtpy `except` policy configGrzegorz Bizon2019-01-143-10/+5
| * | | | | Add more specs for only/except policy config entryGrzegorz Bizon2019-01-142-3/+51
| * | | | | Make fabrication of default config entry more readableGrzegorz Bizon2019-01-142-5/+7
| * | | | | Refactor only/except configuration policiesGrzegorz Bizon2019-01-1410-21/+21
* | | | | | Merge branch 'sh-fix-issue-55161' into 'master'Rémy Coutable2019-01-151-5/+15
|\ \ \ \ \ \
| * | | | | | Fix failing MySQL spec due to deadlock conditionStan Hu2019-01-141-5/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-part-of-55966' into 'master'Lin Jen-Shin2019-01-151-0/+3
|\ \ \ \ \ \
| * | | | | | Ignore Repository::AmbiguousRefError in db/fixtures/developmentRémy Coutable2019-01-141-0/+3
* | | | | | | Merge branch '5708-add-contact-sales-option-via-banner-for-canary-deployments...Filipa Lacerda2019-01-155-14/+20
|\ \ \ \ \ \ \
| * | | | | | | Fixing a syntax warning5708-add-contact-sales-option-via-banner-for-canary-deploymentsScott Hampton2019-01-111-1/+1
| * | | | | | | Backporting environments helperScott Hampton2019-01-113-8/+14
| * | | | | | | Backport prettier changeScott Hampton2019-01-111-3/+3
| * | | | | | | Backporting a change in ee branchScott Hampton2019-01-111-3/+3
* | | | | | | | Merge branch '52278-squash-checkbox-fix' into 'master'Phil Hughes2019-01-156-41/+185
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "When merging an MR, the squash checkbox isn't always supported"Natalia Tepluhina2019-01-156-41/+185
|/ / / / / / / /
* | | | | | | | Merge branch 'remove-cancel-all-button-in-job-list-view' into 'master'Grzegorz Bizon2019-01-156-83/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Delete extra empty line in project.rbJordi Llull Chavarría2019-01-071-1/+0
| * | | | | | | Remove cancel all action in Jobs ControllerJordi Llull2019-01-073-57/+2
| * | | | | | | Remove cancel all jobs button in general jobs list viewJordi Llull2019-01-073-25/+5
* | | | | | | | Merge branch 'winh-idempotent-parseboolean' into 'master'Kushal Pandya2019-01-152-7/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Make parseBoolean idempotentWinnie Hellmann2019-01-152-7/+19
|/ / / / / / /
* | | | | | | Merge branch 'cluster-integration-link-update' into 'master'Evan Read2019-01-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Clarify cluster integration link is for all KubernetesDylan Griffith2019-01-141-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'winh-jsdoc' into 'master'Clement Ho2019-01-148-77/+159
|\ \ \ \ \ \ \
| * | | | | | | Generate searchable JSDoc documentationWinnie Hellmann2019-01-148-77/+159
|/ / / / / / /
* | | | | | | Merge branch 'gt-externalize-app-views-projects-project_members' into 'master'Clement Ho2019-01-148-35/+86
|\ \ \ \ \ \ \
View Lorry Controller Status