summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Changed "from self-hosted" to "from self-managed" to be in line with current ...patch-37Amanda Rueda2019-01-151-1/+1
* Merge branch 'mg-upgrade-prettier-again' into 'master'Clement Ho2019-01-1568-133/+124
|\
| * Upgrade prettier and reformat files as necessaryMike Greiling2019-01-1468-133/+124
* | Merge branch 'patch-37' into 'master'Fatih Acet2019-01-152-17/+53
|\ \
| * | Externalize strings from `/app/views/profiles/accounts`André Gama2019-01-152-17/+53
|/ /
* | Merge branch 'allow-to-quarantine-tests' into 'master'Robert Speicher2019-01-154-4/+37
|\ \
| * | Add jobs to run quarantine testsRémy Coutable2019-01-152-1/+17
| * | Quarantine very flaky testsRémy Coutable2019-01-151-3/+3
| * | Allow to quarantine testsRémy Coutable2019-01-152-0/+17
* | | Merge branch '55111-gitlab-api-does-not-manage-default_branch_protection-3-va...Nick Thomas2019-01-153-2/+9
|\ \ \
| * | | API: Fix default branch protection setting for Admin APIRobert Schilling2019-01-153-2/+9
|/ / /
* | | Merge branch 'docs/uplift-branches-api-doc' into 'master'Achilleas Pipinellis2019-01-152-142/+83
|\ \ \
| * | | Add more information and refactor format of branch-related API topicsEvan Read2019-01-152-142/+83
|/ / /
* | | Merge branch 'docs/uplift-avatar-api-doc' into 'master'Achilleas Pipinellis2019-01-151-15/+23
|\ \ \
| * | | Add more information and refactor format of Avatar API topicEvan Read2019-01-151-15/+23
|/ / /
* | | Merge branch 'homepage-proj-descr-cutoff' into 'master'Annabel Dunstone Gray2019-01-152-2/+9
|\ \ \
| * | | Increase line height of project summariesgfyoung2019-01-142-2/+9
* | | | 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