summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Made speed optimisations to the scripttz-prettier-baseTim Zallmann2018-03-145-23/+52
* Made it blazing fast by running only against staged filesTim Zallmann2018-03-132-10/+32
* Added .vscode to .gitignore and removed settings.jsonTim Zallmann2018-03-122-4/+1
* Added Documentation about prettier to new FE documentation.Tim Zallmann2018-03-122-0/+33
* Got rid of extraneaous varTim Zallmann2018-03-121-3/+3
* Fixed ESLint errors for prettier filesTim Zallmann2018-03-123-42/+44
* Unfortunately we need '"arrow-parens": 0,' set for the transitionTim Zallmann2018-03-121-1/+2
* Updated Parser ConfigurationTim Zallmann2018-03-121-1/+1
* Switched off no-mixed-operators to work with prettierTim Zallmann2018-03-121-0/+1
* Changed "arrow-parens": ["error", "as-needed"] ESLint ruleTim Zallmann2018-03-122-2/+2
* Fixed arrowParens option typoTim Zallmann2018-03-121-1/+1
* Updated Rules to match prettierTim Zallmann2018-03-123-3/+13
* Updated ESLint RulesTim Zallmann2018-03-127-108/+92
* Basic Installation of PrettierTim Zallmann2018-03-124-4/+129
* 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
|/ / / / / /
* | | | | | Merge branch 'jprovazn-commits-count-reschedule' into 'master'Yorick Peterse2018-03-095-2/+81
|\ \ \ \ \ \
| * | | | | | Reschedule commits_count background migrationjprovazn-commits-count-rescheduleJan Provaznik2018-03-095-2/+81
* | | | | | | Merge branch 'sh-make-add-index-idempotent' into 'master'Yorick Peterse2018-03-091-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix index name to Rails default to ensure idempotencysh-make-add-index-idempotentStan Hu2018-03-081-3/+4
* | | | | | | | Merge branch 'patch-28-docs' into 'master'Filipa Lacerda2018-03-091-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing sentence about getting help pagepatch-28-docsFabien Catteau2018-03-081-2/+2
* | | | | | | | | Merge branch '43872-add-next-patch-release-as-a-priority-label' into 'master'Sean McGivern2018-03-091-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update CONTRIBUTING.md43872-add-next-patch-release-as-a-priority-labelFabio Busatto2018-03-051-1/+2
| * | | | | | | | | Update CONTRIBUTING.mdFabio Busatto2018-03-051-4/+11
* | | | | | | | | | Merge branch 'docs-article-devops-gamedev' into 'master'Achilleas Pipinellis2018-03-095-6/+536
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Docs: new article devops + game dev with GitLabMarcia Ramos2018-03-095-6/+536
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'dm-project-group-share-docs' into 'master'Achilleas Pipinellis2018-03-091-7/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clarify what groups projects can be shared with.Douwe Maan2018-03-091-7/+17
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/trigger-script' into 'master'Sean McGivern2018-03-091-5/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Wait for the pipeline to start before canceling itdocs/trigger-scriptAchilleas Pipinellis2018-03-081-5/+14
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-098-12/+123
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use toEqual instead of toBeFalsy/TruthyPhil Hughes2018-03-091-3/+3
| * | | | | | | | | | added rspec test to test when user cant mergemerge-request-widget-source-branch-improvementsPhil Hughes2018-03-081-0/+24
| * | | | | | | | | | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-088-12/+99
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-0912-216/+313
|\ \ \ \ \ \ \ \ \ \