summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'haml-lint-no-plain-nodes' into 'master'Jan Provaznik2019-05-214-0/+666
|\ | | | | | | | | Add HamlLint::Linter::NoPlainNodes linter See merge request gitlab-org/gitlab-ce!28265
| * Add HamlLint::Linter::NoPlainNodes linterhaml-lint-no-plain-nodesLuke Bennett2019-05-204-0/+666
| | | | | | | | | | | | | | | | Add a simple haml_lint linter to report all plain nodes. "Plain nodes" in HAML are scritpless plaintext leaf nodes. Add haml-lint_todo to onboard new haml linters. Excludes existing NoPlainNodes lints.
* | Merge branch '62066-use-batchmodelloader-for-grouptype' into 'master'Sean McGivern2019-05-212-2/+36
|\ \ | | | | | | | | | | | | | | | | | | Use `BatchModelLoader` for GroupType Closes #62066 See merge request gitlab-org/gitlab-ce!28504
| * | Use BatchModelLoader for parent in GroupType62066-use-batchmodelloader-for-grouptypeBrett Walker2019-05-202-2/+36
| | |
* | | Merge branch 'mc-make-diff-content-partial-use-model-method' into 'master'Sean McGivern2019-05-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Makes 'diff/content' partial use instance method See merge request gitlab-org/gitlab-ce!28500
| * | | Makes 'diff/content' partial use instance methodMayra Cabrera2019-05-211-1/+1
|/ / / | | | | | | | | | There's a method defined on viewer that does the conditional.
* | | Merge branch 'default-attempt-project-search' into 'master'Sean McGivern2019-05-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set attempt project search optimizations flag to default_enabled Closes #60452 See merge request gitlab-org/gitlab-ce!28474
| * | | Set attempt project search optimizations flag to default_enabledLuke Picciau2019-05-211-1/+1
|/ / /
* | | Merge branch 'project-branches-scb' into 'master'Phil Hughes2019-05-211-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in projects branches Closes gitlab-ee#10498 See merge request gitlab-org/gitlab-ce!28521
| * | | Resolve CE/EE diffs in projects branchesproject-branches-scbLuke Bennett2019-05-211-0/+2
| | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'import-github-scb' into 'master'Phil Hughes2019-05-211-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in import github Closes gitlab-ee#10497 See merge request gitlab-org/gitlab-ce!28523
| * | | | Resolve CE/EE diffs in import githubimport-github-scbLuke Bennett2019-05-211-0/+2
| |/ / / | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'js-i18n-p-r' into 'master'Tim Zallmann2019-05-214-6/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | i18n JS files starting with p or r See merge request gitlab-org/gitlab-ce!28168
| * | | | I18N JS files starting with p or rjs-i18n-p-rBrandon Labuschagne2019-05-174-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | Merge branch 'qa-tag-report-section-expand' into 'master'Sanad Liaquat2019-05-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added a QA tag to the report component expand button See merge request gitlab-org/gitlab-ce!28416
| * | | | | Apply suggestion to app/assets/javascripts/reports/components/report_section.vueqa-tag-report-section-expandAleksandr Soborov2019-05-201-1/+1
| | | | | |
| * | | | | Added a QA tag to the report component expand buttonAleksandr Soborov2019-05-171-1/+1
| | | | | |
* | | | | | Merge branch 'js-i18n-c-d' into 'master'Phil Hughes2019-05-213-14/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n of JS files starting with c or d See merge request gitlab-org/gitlab-ce!28007
| * | | | | | I18N of js files starting with c or dBrandon Labuschagne2019-05-213-14/+24
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | Merge branch 'js-i18n-import-projects' into 'master'Phil Hughes2019-05-211-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of import_projects directory See merge request gitlab-org/gitlab-ce!27681
| * | | | | | Internationalisation of import_projects directoryBrandon Labuschagne2019-05-211-2/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | Merge branch 'remove-unnecessary-bind-in-gettext' into 'master'Tim Zallmann2019-05-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary bind call during translation See merge request gitlab-org/gitlab-ce!28393
| * | | | | | Remove unnecessary bind callremove-unnecessary-bind-in-gettextMark Florian2019-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was creating, calling and throwing away a brand new bound function on every single call to `gettext`. This is wasteful, as the original function can be called directly in such a way that `this` is bound correctly.
* | | | | | | Merge branch ↵Filipa Lacerda2019-05-212-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '10091-move-ee-differences-for-app-assets-javascripts-pages-milestones-shared-components-promote_milestone_modal-vue' into 'master' Resolved EE differences in promote milestone modal vue component See merge request gitlab-org/gitlab-ce!28114
| * | | | | | | Resolved EE differences in promote milestone modal vue componentConstance Okoghenun2019-05-212-4/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Created shared mixins for modal content
* | | | | | | Merge branch 'repo-list-table-component' into 'master'Filipa Lacerda2019-05-219-12/+163
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added table component for file listing See merge request gitlab-org/gitlab-ce!28334
| * | | | | | | Added table component for files listingPhil Hughes2019-05-209-12/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/61578
* | | | | | | | Merge branch 'add-allow_failure-to-job-api' into 'master'James Lopez2019-05-215-1/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add allow_failure attribute to Job API Closes #50813 See merge request gitlab-org/gitlab-ce!28406
| * | | | | | | | Add allow_failure attribute to Job APIFabio Pitino2019-05-215-1/+18
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50813
* | | | | | | | Merge branch 'mark-comment-resolved' into 'master'Filipa Lacerda2019-05-212-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change resolve button text to mark comment as resolved Closes #61084 See merge request gitlab-org/gitlab-ce!28484
| * | | | | | | | Change resolve button text to mark comment as resolvedmark-comment-resolvedAnnabel Dunstone Gray2019-05-202-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'graphql-vision-docs' into 'master'Douwe Maan2019-05-211-1/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at a graphql vision See merge request gitlab-org/gitlab-ce!27959
| * | | | | | | | | First pass at a graphql visionNick Thomas2019-05-011-1/+14
| | | | | | | | | |
* | | | | | | | | | Merge branch 'bw-fix-merge-request-docs' into 'master'Douwe Maan2019-05-211-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Checkout locally by adding a git alias" needs small change See merge request gitlab-org/gitlab-ce!28330
| * | | | | | | | | | Example should better reflect our default 'origin'bw-fix-merge-request-docsBrett Walker2019-05-151-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-57' into 'master'Douwe Maan2019-05-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update API dox to save others from my mistakes See merge request gitlab-org/gitlab-ce!28368
| * | | | | | | | | | | Update API dox to save others from my mistakespatch-57Sarah Groff Hennigh-Palermo2019-05-161-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'revert-47e5eedc' into 'master'Grzegorz Bizon2019-05-213-36/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'" See merge request gitlab-org/gitlab-ce!28492
| * | | | | | | | | | | | Revert "Merge branch ↵revert-47e5eedcKerri Miller2019-05-203-36/+0
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'" This reverts merge request !27978
* | | | | | | | | | | | Merge branch 'patch-54' into 'master'Rémy Coutable2019-05-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add @luisdiogo2071317 as Portuguese proofreader See merge request gitlab-org/gitlab-ce!28080
| * | | | | | | | | | | | Update proofreader.mdluisdiogo20713172019-05-031-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '62038-chevron-down' into 'master'Phil Hughes2019-05-212-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds arrow icons to select menu in CI/CD settings Closes #62038 See merge request gitlab-org/gitlab-ce!28476
| * | | | | | | | | | | | | Adds arrow icons to select option in CI/CD settings62038-chevron-downFilipa Lacerda2019-05-202-1/+6
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds custom-select class to the select menu for variables type in CI/CD settings
* | | | | | | | | | | | | Merge branch '61990-spinner' into 'master'Phil Hughes2019-05-212-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates loading icon in commit's page Closes #61990 See merge request gitlab-org/gitlab-ce!28475
| * | | | | | | | | | | | | Updates loading icon in commit's page61990-spinnerFilipa Lacerda2019-05-202-2/+7
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the dropdowns in the mini pipeline graph it updates the loading icon to use the new orange version
* | | | | | | | | | | | | Merge branch 'new-group-member-scb' into 'master'Phil Hughes2019-05-213-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in new group member view Closes gitlab-ee#11026 See merge request gitlab-org/gitlab-ce!28409
| * | | | | | | | | | | | | Resolve CE/EE diffs in new group member viewnew-group-member-scbLuke Bennett2019-05-203-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | Merge branch '60750-milestone-header' into 'master'Phil Hughes2019-05-212-12/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix layout of group milestone header Closes #60750 See merge request gitlab-org/gitlab-ce!28487
| * | | | | | | | | | | | | | Fix layout of group milestone header60750-milestone-headerAnnabel Dunstone Gray2019-05-202-12/+20
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'update-docs-alert-bot' into 'master'Achilleas Pipinellis2019-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to docs sentence about alertbot opening issues See merge request gitlab-org/gitlab-ce!28503