summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 'winh-issue-boards-vuex-store' into 'master'Phil Hughes2019-05-208-0/+363
|\ | | | | | | | | | | | | Create empty Vuex store for issue boards Closes #61622 See merge request gitlab-org/gitlab-ce!28229
| * Create empty Vuex store for issue boardsWinnie Hellmann2019-05-208-0/+363
|/
* Merge branch 'kinolaev-master-patch-13154' into 'master'Grzegorz Bizon2019-05-203-1/+9
|\ | | | | | | | | Auto-DevOps: allow to disable rollout status check See merge request gitlab-org/gitlab-ce!28130
| * Auto-DevOps: allow to disable rollout status checkSergej2019-05-173-1/+9
| |
* | Merge branch 'ce-6481-use-elasticsearch-indexer-in-specs' into 'master'Rémy Coutable2019-05-202-1/+14
|\ \ | | | | | | | | | | | | CE backport for "Use gitlab-elasticsearch-indexer in tests" See merge request gitlab-org/gitlab-ce!28369
| * | CE backport for "Use gitlab-elasticsearch-indexer in tests"ce-6481-use-elasticsearch-indexer-in-specsNick Thomas2019-05-162-1/+14
| | |
* | | Merge branch 'ce-57402-add-issues-statistics-api-endpoints' into 'master'Rémy Coutable2019-05-2015-2318/+3642
|\ \ \ | | | | | | | | | | | | | | | | Add issues_statistics api endpoints See merge request gitlab-org/gitlab-ce!27366
| * | | Review updates and cleanupce-57402-add-issues-statistics-api-endpointsAlexandru Croitor2019-05-178-97/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Cleaned issues and issues_statistics docs * Renamed param with_labels_data to with_labels_details * Added spec for N+1 check when retrieving labels from issue * Refactoed CheckAssigneesCount validation class
| * | | Add params validations and remove extra params supportAlexandru Croitor2019-05-1511-75/+383
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove label_name and milestone_title params support Add mutually_exclusive validation for author_id and author_username Add mutually_exclusive validation for assignee_id and assignee_username Add validation to allow single value for asignee_username on CE Add separate issue_stats_params helper for statistics params and reuse in issues_params.
| * | | Move issue details to from IssueBasic to Issue entityAlexandru Croitor2019-05-155-20/+30
| | | | | | | | | | | | | | | | | | | | Cleanup IssueBasic entity to keep it basic and move extra attributes to Issue entity which contains more details
| * | | Changes to issues apiAlexandru Croitor2019-05-1513-2296/+3306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When issues_controller endpoint was used for search, the parameters passed to the controller were slightly different then the ones passed to API. Because the searchbar UI is reused in different places and builds the parameters passed to request in same way we need to account for old parameter names. Add issues_statistics api endpoints Adds issue_statistics api endpoints for issue lists and returns counts of issues for all, closed and opened states. Expose more label attributes based on a param When requesting issues list through API expose more attributes for labels, like color, description if with_labels_data param is being passed, avoiding this way to change response schema for users that already use API. https://gitlab.com/gitlab-org/gitlab-ce/issues/57402
* | | | Merge branch ↵Nick Thomas2019-05-202-17/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44696-pages-domain-verification-seems-to-be-struggling-to-scale-to-gitlab-com-levels' into 'master' Remove remove_disabled_domains feature flag Closes #44696 See merge request gitlab-org/gitlab-ce!28408
| * | | | Remove remove_disabled_domains feature flagVladimir Shushlin2019-05-202-17/+0
|/ / / /
* | | | Merge branch 'repo-list-vue-app' into 'master'Filipa Lacerda2019-05-2024-4/+184
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Setup the Vue app for repository file listing See merge request gitlab-org/gitlab-ce!28326
| * | | | Setup Vue app for repository file listingPhil Hughes2019-05-2024-4/+184
|/ / / / | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/61578
* | | | Merge branch '10444-ee-diff-commits-show' into 'master'Filipa Lacerda2019-05-201-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE differences for `app/views/projects/commits/show.html.haml` Closes gitlab-ee#10444 See merge request gitlab-org/gitlab-ce!28448
| * | | | Move EE differences for `app/views/projects/commits/show.html.haml`Natalia Tepluhina2019-05-201-0/+2
|/ / / /
* | | | Merge branch 'sh-fix-tag-push-remote-mirror' into 'master'Nick Thomas2019-05-207-67/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix remote mirrors not updating after tag push Closes #51240 See merge request gitlab-org/gitlab-ce!28430
| * | | | Fix remote mirrors not updating after tag pushsh-fix-tag-push-remote-mirrorStan Hu2019-05-177-67/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remote mirrors were only being updated after pushes to branches, not tags. This change consolidates the functionality into Git::BaseHooksService so that both tags and branches will now update remote mirrors. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51240
* | | | | Merge branch 'admin-users-head-scb' into 'master'Phil Hughes2019-05-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in admin users head Closes gitlab-ee#10509 See merge request gitlab-org/gitlab-ce!28411
| * | | | | Resolve CE/EE diffs in admin users headadmin-users-head-scbLuke Bennett2019-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | Merge branch '58284-git-basics-docs' into 'master'Achilleas Pipinellis2019-05-191-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Docs: document `git init`" Closes #58284 See merge request gitlab-org/gitlab-ce!28450
| * | | | | | Resolve "Docs: document `git init`"Edward Angert2019-05-191-1/+23
|/ / / / / /
* | | | | | Merge branch 'docs/edit-mysql-doc' into 'master'Achilleas Pipinellis2019-05-191-14/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit MySQL services page See merge request gitlab-org/gitlab-ce!28344
| * | | | | | Edit MySQL services pageEvan Read2019-05-191-14/+11
|/ / / / / /
* | | | | | Merge branch 'winh-serverless-tests-selectors' into 'master'Tim Zallmann2019-05-194-24/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use component selectors in serverless frontend tests See merge request gitlab-org/gitlab-ce!28307
| * | | | | | Use component selectors in serverless frontend testsWinnie Hellmann2019-05-194-24/+37
|/ / / / / /
* | | | | | Merge branch 'docs-import-csv' into 'master'Mike Lewis2019-05-191-7/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CSV Import doc, clarified order of column headers and recommended test import Closes #60622 See merge request gitlab-org/gitlab-ce!28449
| * | | | | | Clarified order of column headers and recommended test importNoveed Safipour2019-05-191-7/+13
| | | | | | |
* | | | | | | Merge branch '61795-fix-error-when-moving-issues' into 'master'Tim Zallmann2019-05-192-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent form submit when Move is clicked Closes #61795 See merge request gitlab-org/gitlab-ce!28317
| * | | | | | Prevent form submit when Move is clicked61795-fix-error-when-moving-issuesHeinrich Lee Yu2019-05-142-1/+6
| | | | | | |
* | | | | | | Merge branch 'docs/ee-only-api-single-codebase' into 'master'12-0-auto-deploy-0009837Evan Read2019-05-1812-0/+2889
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring all EE-only API docs to CE See merge request gitlab-org/gitlab-ce!28439
| * | | | | | | Bring all EE-only API docs to CEAchilleas Pipinellis2019-05-1812-0/+2889
| | | | | | | |
* | | | | | | | Merge branch 'docs/single-codebase-dev-guides' into 'master'Evan Read2019-05-181-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove doc/README.md from list of pending files See merge request gitlab-org/gitlab-ce!28421
| * | | | | | | Remove doc/README.md from list of pending filesdocs/single-codebase-dev-guidesAchilleas Pipinellis2019-05-171-2/+1
| | | | | | | |
* | | | | | | | Merge branch ↵Stan Hu2019-05-181-26/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61432-lib-tasks-lint-rake-can-block-indefinitely-if-stderr-fills-up' into 'master' Resolve "lib/tasks/lint.rake can block indefinitely if stderr fills up" Closes #61432 See merge request gitlab-org/gitlab-ce!28402
| * | | | | | | | Avoid pipes so it doesn't overflow61432-lib-tasks-lint-rake-can-block-indefinitely-if-stderr-fills-upLin Jen-Shin2019-05-181-26/+9
|/ / / / / / / /
* | | | | | | | Merge branch 'add-date-for-metrics' into 'master'Evan Read2019-05-171-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add in release when metrics report was added See merge request gitlab-org/gitlab-ce!28274
| * | | | | | | | Add in release when metrics report was addedBrendan O'Leary 🐢2019-05-171-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'jc-docs-for-git-pcre2' into 'master'Achilleas Pipinellis2019-05-171-2/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs to describe how to compile git with libpcre2 See merge request gitlab-org/gitlab-ce!28199
| * | | | | | | | Add docs to describe how to compile git with libpcre2jc-docs-for-git-pcre2John Cai2019-05-151-2/+24
| | | | | | | | |
* | | | | | | | | Merge branch 'pl-fix-warning' into 'master'Andreas Brandl2019-05-171-2/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate definition of DOWNTIME See merge request gitlab-org/gitlab-ce!28294
| * | | | | | | | | Remove duplicate definition of DOWNTIMEpl-fix-warningPeter Leitzen2019-05-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This silences the warning: 20190301081611_migrate_project_migrate_sidekiq_queue.rb:8: warning: already initialized constant MigrateProjectMigrateSidekiqQueue::DOWNTIME
* | | | | | | | | | Merge branch ↵Fatih Acet2019-05-174-1/+56
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61657-allow-report-section-list-to-not-have-redundant-status-icon' into 'master' Resolve "Allow report section list to not have redundant status icon" Closes #61657 See merge request gitlab-org/gitlab-ce!28226
| * | | | | | | | | | Allow hiding of report status icon in report item61657-allow-report-section-list-to-not-have-redundant-status-iconSam Bigelow2019-05-094-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow hiding of all report items' status icons
* | | | | | | | | | | Merge branch 'js-i18n-g-files' into 'master'Fatih Acet2019-05-174-3/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n of JS files starting with g See merge request gitlab-org/gitlab-ce!28009
| * | | | | | | | | | | I18N of JS files starting with gjs-i18n-g-filesBrandon Labuschagne2019-05-164-3/+11
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'docs-interact-with-git' into 'master'Drew Blessing2019-05-172-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs clarifying GitLab Basics Git info See merge request gitlab-org/gitlab-ce!27964
| * | | | | | | | | | | Update command-line-commands to add clarity on where one can edit codedocs-interact-with-gitMike Lewis2019-05-011-1/+3
| | | | | | | | | | | |