summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix height of input groups60778-input-text-heightAnnabel Dunstone Gray2019-05-203-0/+10
|
* Merge branch '10761-add-mr-widget-review-instructions-ce-backport' into 'master'Fatih Acet2019-05-208-27/+100
|\ | | | | | | | | CE Backport for Add Visual Review instructions to the MR Widget See merge request gitlab-org/gitlab-ce!28196
| * Add backport changesSarah Groff Hennigh-Palermo2019-05-208-27/+100
|/ | | | Adds backport changes for ee
* Merge branch 'if-10137-ee_specific_lines_groups_api' into 'master'Lin Jen-Shin2019-05-202-14/+19
|\ | | | | | | | | CE port of Move EE specific lines in API::Groups See merge request gitlab-org/gitlab-ce!28467
| * CE port of Move EE specific lines in API::GroupsImre Farkas2019-05-202-14/+19
|/
* Merge branch 'docs-pipelines-for-merged-ref-must-use-only-merge-requests' ↵Evan Read2019-05-201-0/+4
|\ | | | | | | | | | | | | | | | | into 'master' Clarify how to enable pipelines for merged results Closes gitlab-ee#11401 See merge request gitlab-org/gitlab-ce!28050
| * Clarify how to enable pipelines for merged resultsShinya Maeda2019-05-201-0/+4
|/
* Merge branch 'docs-instance_level_clusters' into 'master'Evan Read2019-05-203-6/+31
|\ | | | | | | | | Initial instance level cluster docs See merge request gitlab-org/gitlab-ce!27873
| * Initial instance level cluster docsJames Fargher2019-05-203-6/+31
|/
* Merge branch 'fu7mu4-master-patch-90398' into 'master'Rémy Coutable2019-05-201-0/+1
|\ | | | | | | | | Add Tomo Dote to Japanese proofreader See merge request gitlab-org/gitlab-ce!28263
| * Add Tomo Dote to Japanese proofreaderfu7mu42019-05-111-0/+1
| |
* | Merge branch 'revert-c5a9bc17' into 'master'Yorick Peterse2019-05-209-153/+29
|\ \ | | | | | | | | | | | | Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'" See merge request gitlab-org/gitlab-ce!28483
| * | Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'"revert-c5a9bc17Ryan Cobb2019-05-209-153/+29
| | | | | | | | | This reverts merge request !27474
* | | Merge branch 'fl-fix-next-flag-for-good' into 'master'Phil Hughes2019-05-203-2/+7
|\ \ \ | | | | | | | | | | | | | | | | Next badge must be visible when canary flag is true See merge request gitlab-org/gitlab-ce!28478
| * | | Next badge must be visible when canary flag is truefl-fix-next-flag-for-goodFilipa Lacerda2019-05-203-2/+7
| | | |
* | | | Merge branch '59313-mandatory-window-params' into 'master'Jan Provaznik2019-05-202-13/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require time window params in metrics dashboard Closes #59313 See merge request gitlab-org/gitlab-ce!28194
| * | | | Require time window params in metrics dashboardSarah Yasonik2019-05-202-13/+10
|/ / / /
* | | | Merge branch 'ci_age_based_runner_priority' into 'master'Nick Thomas2019-05-207-1/+58
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Added filtering jobs by age to jobs/request API endpoint See merge request gitlab-org/gitlab-ce!28034
| * | | Added filtering jobs by age to jobs/request API endpointDmitry Chepurovskiy2019-05-207-1/+58
|/ / /
* | | Merge branch 'fix-typo' into 'master'60879-test-analyzer-run-timeout-defaultDouglas Barbosa Alexandre2019-05-2032-42/+42
|\ \ \ | | | | | | | | | | | | | | | | Fix typos in the whole gitlab-ce project See merge request gitlab-org/gitlab-ce!28395
| * | | Fix typos in the whole gitlab-ce projectYoginth2019-05-2032-42/+42
|/ / /
* | | Merge branch 'po-gitaly-wrapper-proc' into 'master'Kamil Trzciński2019-05-202-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Update Gitaly to v1.42.1 See merge request gitlab-org/gitlab-ce!28425
| * | | Update Gitaly to v1.42.1Paul Okstad2019-05-202-1/+6
|/ / / | | | | | | | | | | | | | | | This version of Gitaly fixes a bug in gitaly-wrapper that prevented the proper detection of the executable path for a Gitaly process.
* | | Merge branch '60818_yamllint_project_root' into 'master'Kamil Trzciński2019-05-204-32/+37
|\ \ \ | | | | | | | | | | | | | | | | #60818 Correct linting for project root *.yml files See merge request gitlab-org/gitlab-ce!27579
| * | | #60818 Correct linting for project root *.yml filesWill Hall2019-05-204-32/+37
|/ / /
* | | Merge branch '49517-fix-notes-import-export' into 'master'Mayra Cabrera2019-05-203-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Include type to notes import / export Closes #49517 See merge request gitlab-org/gitlab-ce!28401
| * | | Include type to notes import / export49517-fix-notes-import-exportHeinrich Lee Yu2019-05-173-2/+12
| | | |
* | | | Merge branch 'qa-retry-in-ci-only' into 'master'Sanad Liaquat2019-05-201-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Only retry failing QA tests in CI See merge request gitlab-org/gitlab-ce!28163
| * | | | Only retry failing QA tests in CIqa-retry-in-ci-onlyMark Lapierre2019-05-201-3/+5
| | | | | | | | | | | | | | | | | | | | No need to retry automatically when running tests locally
* | | | | Merge branch 'display-junit-classname-in-modal' into 'master'Kushal Pandya2019-05-206-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display classname JUnit attribute in report modal See merge request gitlab-org/gitlab-ce!28376
| * | | | | Display classname JUnit attribute in report modalFabio Pitino2019-05-206-0/+17
|/ / / / /
* | | | | 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