summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move shared wiki templates to own directoriessort-wiki-pages-by-dateAlex Kalderimis2019-09-1242-201/+296
* Remove sleep_for_rpc helper methodAlex Kalderimis2019-09-122-20/+33
* Fix tests that depend on wiki routesAlex Kalderimis2019-09-1211-55/+121
* Support legacy pathsAlex Kalderimis2019-09-126-36/+68
* Improve JS filesAlex Kalderimis2019-09-123-5/+8
* In flat view mode, allow directories to be clickedAlex Kalderimis2019-09-1257-637/+1009
* Add different flattening behaviour to the wiki page viewsAlex Kalderimis2019-09-1227-428/+900
* Add last_version, page_count and group_by_directory to WikiDirectoryAlex Kalderimis2019-09-125-111/+158
* Improve wiki page groupingAlex Kalderimis2019-09-122-11/+12
* Merge branch 'qa-ml-fix-nplus-pipeline' into 'master'Sanad Liaquat2019-09-122-3/+9
|\
| * Update test to not try to sign outMark Lapierre2019-09-122-3/+9
|/
* Merge branch 'migrate-diff-file-header-tests' into 'master'Mike Greiling2019-09-124-756/+489
|\
| * Refactor DiffFileHeader testsIllya Klymov2019-09-124-756/+489
|/
* Merge branch 'docs-add-note-terminals' into 'master'Evan Read2019-09-121-0/+5
|\
| * Add note about incompatibility of session_server with runner helm chartAlexander Tanayno2019-09-121-0/+5
|/
* Merge branch 'qa-wiki-ssh-spec' into 'master'Mark Lapierre2019-09-125-2/+31
|\
| * Update qa resources and pages for Geo wiki specqa-wiki-ssh-specJennie Louie2019-09-105-2/+31
* | Merge branch 'docs-project-membership-mpenna20190906' into 'master'Evan Read2019-09-121-8/+12
|\ \
| * | Docs: Clarified project membership terminologyMatt Penna2019-09-121-8/+12
|/ /
* | Merge branch 'patch-72' into 'master'Ray Paik2019-09-121-2/+1
|\ \
| * | Update a dead external linkFreezed2019-09-111-2/+1
* | | Merge branch 'docs-prot-branches-mpenna20190906' into 'master'Evan Read2019-09-121-3/+2
|\ \ \
| * | | Docs: Clarified wording to match Permissions docMatt Penna2019-09-121-3/+2
|/ / /
* | | Merge branch 'docs-permissions-clarify-mpenna20190906' into 'master'Evan Read2019-09-121-7/+3
|\ \ \
| * | | Docs: Clarified permissions of protected branchesMatt Penna2019-09-121-7/+3
|/ / /
* | | Merge branch 'docs-update-vetur-vscode-extension' into 'master'Mike Lewis2019-09-121-16/+19
|\ \ \
| * | | Update outdated instructions for vetur in vscodedocs-update-vetur-vscode-extensionMiguel Rincon2019-08-301-16/+19
* | | | Merge branch 'docs-sethgitlab-documentationwf' into 'master'Mike Lewis2019-09-121-5/+4
|\ \ \ \
| * | | | Apply suggestion to doc/development/documentation/feature-change-workflow.mdSeth Berger2019-09-121-2/+2
| * | | | Apply suggestion to doc/development/documentation/feature-change-workflow.mdSeth Berger2019-09-121-1/+1
| * | | | Apply suggestion to doc/development/documentation/feature-change-workflow.mdSeth Berger2019-09-121-2/+1
| * | | | Update documentation requirementsdocs-sethgitlab-documentationwfSeth Berger2019-08-261-3/+3
* | | | | Merge branch '8605-support-san-extension' into 'master'Thong Kuah2019-09-122-0/+73
|\ \ \ \ \
| * | | | | Backport of ee/15773: Allow SmartCard authentication to use SAN extensionsSebastián Arcila Valenzuela2019-09-122-0/+73
|/ / / / /
* | | | | Merge branch 'sh-fix-removed-support-bot-column' into 'master'Mayra Cabrera2019-09-121-0/+3
|\ \ \ \ \
| * | | | | Ignore support_bot column in users tablesh-fix-removed-support-bot-columnStan Hu2019-09-111-0/+3
* | | | | | Merge branch 'qa-ml-refactor-protected-branch-test' into 'master'Mark Lapierre2019-09-115-27/+22
|\ \ \ \ \ \
| * | | | | | Refactor protected branch resource and specqa-ml-refactor-protected-branch-testMark Lapierre2019-09-115-27/+22
* | | | | | | Merge branch 'static-objects-external-storage' into 'master'Thong Kuah2019-09-1135-5/+646
|\ \ \ \ \ \ \
| * | | | | | | Enable serving static objects from an external storagestatic-objects-external-storageAhmad Sherif2019-09-1035-5/+646
* | | | | | | | Merge branch 'ce-indicator-for-pipeline-for-merge-train' into 'master'Thong Kuah2019-09-117-132/+82
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Make MR pipeline widget text more descriptive (CE)ce-indicator-for-pipeline-for-merge-trainNathan Friend2019-09-117-132/+82
* | | | | | | | Merge branch '14671-analytics-feature-flags' into 'master'Thong Kuah2019-09-112-11/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Update feature flag name for Cycle AnalyticsAdam Hegyi2019-09-112-11/+10
|/ / / / / / / /
* | | | | | | | Merge branch '67248-snippet-title-whitespace' into 'master'Annabel Dunstone Gray2019-09-112-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add bottom margin to snippet titleMarcel van Remmerden2019-09-112-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'feature-enhance-pipeline-webhook' into 'master'Mayra Cabrera2019-09-114-0/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Add source and merge_request fields to pipeline event webhookBian Jiaping2019-09-114-0/+53
|/ / / / / / / /
* | | | | | | | Merge branch '9931-github-integration-default-static-status-check-names' into...Mayra Cabrera2019-09-111-5/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Update documentation for GitHub integrationMarius Bobin2019-09-111-5/+4
|/ / / / / / / /