summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply suggestion to doc/ci/junit_test_reports.mdpatch-51Blair Lunceford2019-05-011-1/+1
|
* Update example with concrete pathBlair Lunceford2019-04-221-1/+1
|
* Add example for the artifacts:paths sectionBlair Lunceford2019-04-191-2/+4
|
* Merge branch '57247-show-prioritized-labels-to-guests' into 'master'Clement Ho2019-04-197-35/+59
|\ | | | | | | | | | | | | Show prioritized labels to guests Closes #57247 See merge request gitlab-org/gitlab-ce!27307
| * Show prioritized labels to guests57247-show-prioritized-labels-to-guestsHeinrich Lee Yu2019-04-197-35/+59
| | | | | | | | Disables sorting when guests are viewing
* | Merge branch 'retry-review-deploy-twice' into 'master'Lin Jen-Shin2019-04-194-6/+9
|\ \ | | | | | | | | | | | | Retry the review-deploy job twice and make the Review App cleanup more efficient See merge request gitlab-org/gitlab-ce!27489
| * | Make the Review App cleanup more efficientretry-review-deploy-twiceRémy Coutable2019-04-194-6/+8
| | | | | | | | | | | | | | | | | | Ensure that the cleanup starts right away. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Retry the review-deploy job twiceRémy Coutable2019-04-191-0/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'xanf/gitlab-ce-improve-project-overview' into 'master'Stan Hu2019-04-196-4/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improvements to Project overview UI Closes #55025 See merge request gitlab-org/gitlab-ce!26796
| * | | Improvements to Project overview UIIllya Klymov2019-04-196-4/+45
|/ / /
* | | Merge branch 'quarantine-flaky-tests' into 'master'Lin Jen-Shin2019-04-191-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Flaky tests: spec/requests/api/badges_spec.rb" Closes #60397 See merge request gitlab-org/gitlab-ce!27484
| * | | 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 'fixed-diff-border' into 'master'Annabel Dunstone Gray2019-04-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes the border color on diffs See merge request gitlab-org/gitlab-ce!27479
| * | | | Fixes the border color on diffsPhil Hughes2019-04-181-2/+2
| | | | |
* | | | | Merge branch 'tpresa-fix-whitespace-in-cluster-docs' into 'master'Achilleas Pipinellis2019-04-191-20/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove leading whitespaces from serviceaccount/clusterrolebinding multi-resource YAML See merge request gitlab-org/gitlab-ce!27501
| * | | | | Remove leading whitespaces from serviceaccount/clusterrolebinding ↵Thiago Presa2019-04-191-20/+20
|/ / / / / | | | | | | | | | | | | | | | multi-resource YAML
* | | | | Merge branch 'small-improvement-in-docs' into 'master'Achilleas Pipinellis2019-04-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Highlighted 'not' in the docs See merge request gitlab-org/gitlab-ce!27506
| * | | | | Highlighted 'not' in the docsKartikey Tanna2019-04-191-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ce-issue-10671' into 'master'Grzegorz Bizon2019-04-192-8/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | CE part for extract EE specific lines from issue.rb See merge request gitlab-org/gitlab-ce!27481
| * | | | Aligned changes to Issuable with EEce-issue-10671Patrick Derichs2019-04-181-4/+4
| | | | |
| * | | | Aligned IssuesController implementation with EEPatrick Derichs2019-04-181-4/+4
| | | | |
* | | | | 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.