summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Put three flaky tests in quarantinequarantine-flaky-testsRémy Coutable2019-04-191-3/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch ↵Grzegorz Bizon2019-04-192-21/+27
|\ | | | | | | | | | | | | | | | | '58663-use-include-template-syntax-for-including-the-code-quality-job' into 'master' Resolve "Use include template syntax for including the Code Quality job" Closes #58663 See merge request gitlab-org/gitlab-ce!27448
| * Update CodeQuality example docs58663-use-include-template-syntax-for-including-the-code-quality-jobMatija Čupić2019-04-171-20/+26
| |
| * Include CodeQuality with template syntaxMatija Čupić2019-04-171-1/+1
| |
* | Merge branch 'bvl-graphql-only-authorize-rendered-fields' into 'master'Lin Jen-Shin2019-04-199-121/+226
|\ \ | | | | | | | | | | | | | | | | | | Only check abilities on rendered GraphQL nodes Closes #58647 and #60355 See merge request gitlab-org/gitlab-ce!27273
| * | Only check abilities on rendered GraphQL nodesBob Van Landuyt2019-04-189-121/+226
| | | | | | | | | | | | | | | With this we only check abilities on the rendered edges of a GraphQL connection instead of all the nodes in it.
* | | Update VERSION to 11.11.0-prev11.11.0.preGitLab Release Tools Bot2019-04-191-1/+1
| | |
* | | Update CHANGELOG.md for 11.10.0GitLab Release Tools Bot2019-04-19204-1021/+231
| | | | | | | | | [ci skip]
* | | Merge branch 'ac-refactor-project-stats' into 'master'Douwe Maan2019-04-196-120/+149
|\ \ \ | | | | | | | | | | | | | | | | Extract ProjectStatistics updates into a concern See merge request gitlab-org/gitlab-ce!27420
| * | | Extract ProjectStatistics updates into a concernAlessio Caiazza2019-04-196-120/+149
|/ / / | | | | | | | | | Refactor existing tests as a shared example
* | | Merge branch '60383-change-common-metrics-schema' into 'master'Douwe Maan2019-04-193-143/+88
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change the schema of common_metrics.yml Closes #60383 See merge request gitlab-org/gitlab-ce!27283
| * | | Change dashboard order attribute to priority60383-change-common-metrics-schemarpereira22019-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Dashboards will be ordered in descending order of priority. The word 'priority' seems to signify descending order while 'order' signifies ascending order.
| * | | Remove required_metrics and series attributesrpereira22019-04-171-81/+0
| | | | | | | | | | | | | | | | - They are not used by the frontend.
| * | | Change the schema of the common_metrics.ymlrpereira22019-04-173-65/+91
| | | | | | | | | | | | | | | | | | | | - Change it to the new dashboard syntax described here: https://gitlab.com/gitlab-org/gitlab-ce/issues/60383.
* | | | Merge branch '39858-add-group-owned-info-to-projects-api' into 'master'Douwe Maan2019-04-195-4/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return group information on Project endpoint Closes #39858 See merge request gitlab-org/gitlab-ce!27427
| * | | | Adds namespace information to project endpoint39858-add-group-owned-info-to-projects-apiMayra Cabrera2019-04-185-4/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Namespace now return avatar_url and web_url - NamespaceBasic entity was modified to include avatar_url and web_url, information is fetched differently depending if the Namespace is a user or a group Includes documentation changes Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39858
* | | | | Merge branch 'protected-runner-registration' into 'master'Kamil Trzciński2019-04-194-1/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add configuration of access_level for runners on registration via API See merge request gitlab-org/gitlab-ce!27490
| * | | | | Add configuration of access_level for runners on registration via APIzelin-l2019-04-184-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting access_level of new runner to not_protected (default) or ref_protected Minor update to relevant docs and tests
* | | | | | Merge branch '10502-board-list-spec-ce' into 'master'Kushal Pandya2019-04-192-49/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE specific testcase to EE spec file See merge request gitlab-org/gitlab-ce!27505
| * | | | | | Move EE specific testcase to EE spec fileRajat Jain2019-04-192-49/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor `board_list` such that we can reuse the parts of component creation with prop passing with ee specific spec.
* | | | | | | Merge branch 'winh-abuse_reports_spec-timeout' into 'master'Clement Ho2019-04-181-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase timeout for abuse_reports_spec.js to 500ms Closes gitlab-ee#11229 See merge request gitlab-org/gitlab-ce!27502
| * | | | | | | Increase timeout for abuse_reports_spec.js to 500msWinnie Hellmann2019-04-181-0/+3
| | | | | | | |
* | | | | | | | Merge branch 'adriel-fix-cluster-metrics-regression' into 'master'Clement Ho2019-04-182-4/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve cluster metrics regression Closes gitlab-ee#11168 See merge request gitlab-org/gitlab-ce!27442
| * | | | | | | Resolve cluster metrics regressionAdriel Santiago2019-04-182-4/+27
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes a regression causing cluster metrics not to display
* | | | | | | Merge branch 'sh-bump-ruby-required-version-check' into 'master'Michael Kozono2019-04-182-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump required Ruby version check to 2.5.3 Closes #60704 See merge request gitlab-org/gitlab-ce!27495
| * | | | | | | Bump required Ruby version check to 2.5.3Stan Hu2019-04-182-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/58079 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60704
* | | | | | | | Merge branch 'jc-upgrade-gitaly-1.34.0' into 'master'Stan Hu2019-04-182-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.34.0 See merge request gitlab-org/gitlab-ce!27494
| * | | | | | | | Upgrade Gitaly to 1.34.0John Cai2019-04-182-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'ce-10725-restructure-project-merge-request-settings-page' into ↵Michael Kozono2019-04-189-101/+136
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE Backport for "Restructure project merge request settings page" See merge request gitlab-org/gitlab-ce!26834
| * | | | | | | | Update CE-specific files for project MR settings UIce-10725-restructure-project-merge-request-settings-pageNathan Friend2019-04-179-101/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the CE-specific files that reorganizes the project merge request settings UI.
* | | | | | | | | Merge branch 'gitlab-issue-54894' into 'master'Clement Ho2019-04-183-6/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link issues with labels on project/group labels pages See merge request gitlab-org/gitlab-ce!24060
| * | | | | | | | | Fix link issues with labelsTanya Pazitny2019-04-183-6/+43
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * On the project labels page, the label itself should not be clickable. * On the group labels page, the links for Issues and Merge Requests should be shown.
* | | | | | | | | Merge branch ↵Dmitriy Zaporozhets2019-04-183-14/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-11224-flaky-test-projects-audit-events-adding-an-ssh-key-appears-in-the-project-s-audit-events-ee-spec-features-projects-audit_events_spec' into 'master' Introduce the wait_for helper for system tests See merge request gitlab-org/gitlab-ce!27483
| * | | | | | | | | Introduce the wait_for helper for system testsce-11224-flaky-test-projects-audit-events-adding-an-ssh-key-appears-in-the-project-s-audit-events-ee-spec-features-projects-audit_events_specRémy Coutable2019-04-183-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'ssot' into 'master'Sid Sijbrandij2019-04-182-20/+61
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssot as principle See merge request gitlab-org/gitlab-ce!27436
| * | | | | | | | | | Fix anchor linksssotMike Lewis2019-04-171-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix capitalization of termMike Lewis2019-04-171-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Reduce duplicate language by linking to a SSOTMike Lewis2019-04-171-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Resolve duplication of structure info by removing and linking to Style GuideMike Lewis2019-04-171-3/+1
| | | | | | | | | | |
| * | | | | | | | | | Initial content editsMike Lewis2019-04-171-14/+15
| | | | | | | | | | |
| * | | | | | | | | | ssot as principleSid Sijbrandij2019-04-161-16/+58
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '10012-move-ee-diff-for-boards-issue-card-inner' into 'master'Phil Hughes2019-04-184-8/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace ee-specific code for boards/issue_card_inner Closes gitlab-ee#10012 See merge request gitlab-org/gitlab-ce!27394
| * | | | | | | | | | | Replace ee-specific code for boards/issue_card_innerRoman Rodionov2019-04-184-8/+23
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fe-uninstall-cluster-apps' into 'master'Filipa Lacerda2019-04-187-58/+140
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display "Uninstall App" button if app is uninstallable Closes #60641 See merge request gitlab-org/gitlab-ce!27423
| * | | | | | | | | | | Pass installed attribute to app_rowsfe-uninstall-cluster-appsEnrique Alcantara2019-04-181-0/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Show uninstall button when app is uninstallableEnrique Alcantara2019-04-183-13/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create empty uninstall_button component. - Add uninstallable property to application_row component. - Display Uninstall button if app is uninstallable and it is installed.
| * | | | | | | | | | | Determine if app is installed in the storeEnrique Alcantara2019-04-175-53/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create installed property for cluster apps - Pass installed property to the application_row component
* | | | | | | | | | | | Merge branch 'boards-stylelint' into 'master'Filipa Lacerda2019-04-1817-241/+60
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stylelint rules in boards.scss Closes #59895 See merge request gitlab-org/gitlab-ce!27458
| * | | | | | | | | | | | Fix stylelint rules in boards.scssPhil Hughes2019-04-1717-241/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59895
* | | | | | | | | | | | | Merge branch 'if-57131-move_do' into 'master'Achilleas Pipinellis2019-04-183-0/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move external authorization doc to CE See merge request gitlab-org/gitlab-ce!27421