summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump kubectl to ~> 3.0bump-kubeclient-versionBalasankar "Balu" C2018-03-122-11/+11
* Merge branch 'add-indexes-to-todos-for-heavy-users-like-sean' into 'master'Yorick Peterse2018-03-123-1/+36
|\
| * Add partial indexes on todos to handle users with many todosadd-indexes-to-todos-for-heavy-users-like-seanGreg Stark2018-03-093-1/+36
* | Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-123-4/+21
|\ \
| * | Fix code and wiki search results when filename is non-ASCIISean McGivern2018-03-123-4/+21
* | | Merge branch 'fl-document-key-vue' into 'master'Tim Zallmann2018-03-121-0/+51
|\ \ \
| * | | Clean up docsfl-document-key-vueFilipa Lacerda2018-03-011-8/+0
| * | | Merge branch 'master' into fl-document-key-vueFilipa Lacerda2018-03-0164-141/+431
| |\ \ \
| * | | | Adds information about nested v-forFilipa Lacerda2018-02-281-0/+18
| * | | | Merge branch 'master' into fl-document-key-vueFilipa Lacerda2018-02-28169-829/+2617
| |\ \ \ \
| * | | | | Fix typosFilipa Lacerda2018-02-271-5/+11
| * | | | | Adds guidelines regarding `:key` keywordFilipa Lacerda2018-02-271-0/+35
* | | | | | Merge branch 'docs-vue-components' into 'master'Phil Hughes2018-03-121-6/+6
|\ \ \ \ \ \
| * | | | | | Updates file extensions on Vue docsFilipa Lacerda2018-03-121-6/+6
* | | | | | | Merge branch '44139-fix-issue-boards-dup-keys' into 'master'Phil Hughes2018-03-122-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entryKushal Pandya2018-03-121-0/+6
| * | | | | | | Use `list.id` for `:key`Kushal Pandya2018-03-121-1/+1
| |/ / / / / /
* | | | | | | Merge branch '44096-update-zaproxy-image-in-auto-devops-template' into 'master'Dmitriy Zaporozhets2018-03-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use GitLab fork of zaproxyFabien Catteau2018-03-121-1/+1
* | | | | | | | Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-124-14/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwpsEric Eastwood2018-03-084-14/+20
| |/ / / / / / /
* | | | | | | | Merge branch 'remove-jquery-globals' into 'master'Phil Hughes2018-03-12289-20/+386
|\ \ \ \ \ \ \ \
| * | | | | | | | require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-09289-20/+386
* | | | | | | | | Merge branch '43702-update-label-dropdown-wording' into 'master'Phil Hughes2018-03-1217-24/+244
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add changelog entry43702-update-label-dropdown-wordingKushal Pandya2018-03-121-0/+5
| * | | | | | | | Update test for change in label dropdown action nameKushal Pandya2018-03-125-11/+11
| * | | | | | | | Add `createLabelTitle` & `manageLabelsTitle` props for action stringKushal Pandya2018-03-122-5/+43
| * | | | | | | | Add `headerTitle` prop for container header stringKushal Pandya2018-03-122-4/+23
| * | | | | | | | Add `isProject` and computed props to for contextual info for dropdownKushal Pandya2018-03-122-0/+50
| * | | | | | | | Add `isProject` mock configKushal Pandya2018-03-121-0/+1
| * | | | | | | | Use label dropdown helper for rendering contextual stringKushal Pandya2018-03-122-4/+6
| * | | | | | | | Add helpers for labels dropdownKushal Pandya2018-03-122-0/+105
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fl-remove-duplicated-code' into 'master'Phil Hughes2018-03-121-14/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Removes duplicated & non used codefl-remove-duplicated-codeFilipa Lacerda2018-03-091-14/+0
* | | | | | | | Merge branch 'remove-svg-sync-script' into 'master'Clement Ho2018-03-0975-121/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove sync script for gitlab-svgs and reference the vendored library directlyMike Greiling2018-03-0975-121/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'refactor/move-assignee-title-vue-component' into 'master'Clement Ho2018-03-096-62/+72
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Move AssigneeTitle vue componentGeorge Tsiolis2018-03-096-62/+72
* | | | | | | | Merge branch 'move-project-fork-to-rspec' into 'master'Douwe Maan2018-03-093-134/+104
|\ \ \ \ \ \ \ \
| * | | | | | | | Move project fork spinach tests to RSpecSemyon Pupkov2018-03-053-134/+104
* | | | | | | | | Merge branch 'project-active-tab-rspec' into 'master'Douwe Maan2018-03-093-265/+137
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move project active tab spinach tests to RSpecSemyon Pupkov2018-03-083-265/+137
* | | | | | | | | | Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ...Douwe Maan2018-03-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Backport fix new GitHub CI/CD page redirecting to import GitHub status pagece-5194-fix-github-ci-cd-github-auth-missing-query-paramEric Eastwood2018-03-081-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'osw-43951-single-batch-blob-request-to-gitaly' into 'master'Sean McGivern2018-03-092-8/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffsOswaldo Ferreira2018-03-092-8/+15
* | | | | | | | | Merge branch 'docs/ci-yaml-cleanup' into 'master'Achilleas Pipinellis2018-03-092-508/+460
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleanup and consolidate the CI yaml docsdocs/ci-yaml-cleanupAchilleas Pipinellis2018-03-072-508/+460
* | | | | | | | | | Merge branch 'gitlab-ee-4910-exclusive-lease' into 'master'Nick Thomas2018-03-094-0/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add rake task to cleanup any existing exclusive leaseGabriel Mazetto2018-03-094-0/+59
|/ / / / / / / / / /