summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use new location for gitlab-runner helm chartsrunner-chart-repo-use-new-locationBalasankar "Balu" C2019-08-295-4/+9
| | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* Merge branch '66524-issue-due-notification-emails-are-threaded-incorrectly' ↵Kamil Trzciński2019-08-293-1/+22
|\ | | | | | | | | | | | | into 'master' Resolve "Issue due notification emails are threaded incorrectly" See merge request gitlab-org/gitlab-ce!32325
| * Fix issue due notification emails threading66524-issue-due-notification-emails-are-threaded-incorrectlyHeinrich Lee Yu2019-08-293-1/+22
| | | | | | | | | | It should not be a start to a new thread but rather a reply to an existing thread
* | Merge branch 'qa-close-issue-spec' into 'master'Rémy Coutable2019-08-297-3/+77
|\ \ | | | | | | | | | | | | | | | | | | Add E2E spec to ensure that issue closes with commit message Closes gitlab-org/quality/testcases#15 See merge request gitlab-org/gitlab-ce!32347
| * | Add E2E spec to ensure that issue closesNailia Iskhakova2019-08-297-3/+77
|/ / | | | | | | Add E2E spec to test that issue closes with commit message
* | Merge branch '66718-dast-extend-review-only' into 'master'Rémy Coutable2019-08-291-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Set dast job to extend .review-only Closes #66718 See merge request gitlab-org/gitlab-ce!32357
| * | Set dast job to extend .review-only66718-dast-extend-review-onlyKyle Wiebers2019-08-281-1/+3
| | |
* | | Merge branch 'docs-65629-rename-approvers-field' into 'master'Achilleas Pipinellis2019-08-291-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Update documentation screenshot See merge request gitlab-org/gitlab-ce!32369
| * | | Update documentation screenshotSamantha Ming2019-08-291-0/+0
|/ / /
* | | Merge branch 'docs-capitalization-4' into 'master'Achilleas Pipinellis2019-08-2914-57/+55
|\ \ \ | | | | | | | | | | | | | | | | Fix capitalization in more docs See merge request gitlab-org/gitlab-ce!32370
| * | | Fix capitalization in more docsMarcel Amirault2019-08-2914-57/+55
|/ / / | | | | | | | | | | | | Fix capitalization in docs for works like GitLab, Git Omnibus, etc
* | | Merge branch 'docs/edit-autodevops-reqs' into 'master'Achilleas Pipinellis2019-08-291-17/+29
|\ \ \ | | | | | | | | | | | | | | | | Make Auto DevOps requirements easier to read See merge request gitlab-org/gitlab-ce!32246
| * | | Make Auto DevOps requirements easier to readEvan Read2019-08-291-17/+29
|/ / /
* | | Merge branch 'mk/simplify-internal-post-receive-messages' into 'master'Grzegorz Bizon2019-08-296-41/+238
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Simplify internal post receive messages Closes #59808 See merge request gitlab-org/gitlab-ce!31640
| * | | Simplify internal post receive messagesmk/simplify-internal-post-receive-messagesMichael Kozono2019-08-286-41/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of sending varied data to Gitaly, and making Gitaly construct various messages, build the messages first and have Gitaly print either basic messages or alert messages, in the order they come. Depends on https://gitlab.com/gitlab-org/gitaly/merge_requests/1410
* | | | Merge branch 'new-project-milestone-primary-button' into 'master'Kushal Pandya2019-08-292-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | New project milestone primary button See merge request gitlab-org/gitlab-ce!32355
| * | | | Revert "DB change, migratoin and changelog"Lee Tickett2019-08-292-1/+6
|/ / / / | | | | | | | | | | | | This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* | | | Merge branch 'remove-checkbox-styling' into 'master'Kushal Pandya2019-08-291-24/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove checkbox styling See merge request gitlab-org/gitlab-ce!31500
| * | | | Remove checkbox stylingJustin Boyson2019-08-291-24/+0
|/ / / /
* | | | Merge branch 'ce-xanf-move-auto-merge-failed-to-jest' into 'master'Kushal Pandya2019-08-293-47/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Migrate spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js to Jest" See merge request gitlab-org/gitlab-ce!32282
| * | | | Refactored Karma spec to Jest for mr_widget_auto_merge_failedce-xanf-move-auto-merge-failed-to-jestIllya Klymov2019-08-273-47/+60
| | | | |
* | | | | Merge branch ↵Kushal Pandya2019-08-294-19/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56130-operations-environments-shows-incorrect-deployment-date-for-manual-deploy-jobs' into 'master' Show correct deployment date for a manual job Closes #56130 See merge request gitlab-org/gitlab-ce!32072
| * | | | | Show correct deployment date for a manual job56130-operations-environments-shows-incorrect-deployment-date-for-manual-deploy-jobsjakeburden2019-08-284-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only display time if the job has deployed Update JS tests for displaying job deployment time Simplify boolean check in deployedDate
* | | | | | Merge branch 'docs/mention-jest-in-testing-guide' into 'master'Kushal Pandya2019-08-291-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention Jest in testing guide docs See merge request gitlab-org/gitlab-ce!32324
| * | | | | | Apply review suggestionsMark Florian2019-08-291-3/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reword relationship between Jest/Karma/Jasmine - Prefer inline URLs, per the [docs] [docs]: https://docs.gitlab.com/ee/development/documentation/styleguide.html#links
* | | | | | Merge branch ↵James Lopez2019-08-293-15/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62284-follow-up-from-resolve-api-to-get-all-project-group-members-returns-duplicates' into 'master' Resolve "Follow-up from "Resolve "API to get all project/group members returns duplicates""" Closes #62284 See merge request gitlab-org/gitlab-ce!28887
| * | | | | | Uses projects_authorizations.access_level in MembersFinder62284-follow-up-from-resolve-api-to-get-all-project-group-members-returns-duplicatesJacopo2019-08-283-15/+69
| | | | | | |
* | | | | | | Merge branch 'docs-redirected-links-4' into 'master'13085-license-information-in-dependency-list-add-documentationEvan Read2019-08-294-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update a few redirected links Closes #64285 See merge request gitlab-org/gitlab-ce!32195
| * | | | | | | Update a few redirected linksMarcel Amirault2019-08-294-8/+8
|/ / / / / / /
* | | | | | | Merge branch 'performance-bar-warnings' into 'master'Stan Hu2019-08-299-16/+205
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add warnings to performance bar response See merge request gitlab-org/gitlab-ce!31054
| * | | | | | | Add top-level warnings key to performance bar responseperformance-bar-warningsSean McGivern2019-08-283-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This key is useful to reduce the amount of logic needed on the frontend: if `has_warnings` is true, then the frontend knows that the request in question has warnings for some metric.
| * | | | | | | Return warnings for performance bar from backendSean McGivern2019-08-286-16/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each DetailedView subclass, we add a `warnings` array to: 1. The top-level response. 2. Each individual call under the `details` key. We use the `.thresholds` hash on the DetailedView to determine what's a warning. If that hash is empty (the default), then the warnings array will always be empty.
* | | | | | | | Merge branch 'cluster_deployments' into 'master'Stan Hu2019-08-294-1/+41
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add index to improve query performance See merge request gitlab-org/gitlab-ce!31988
| * | | | | | | Remove redundant indexThong Kuah2019-08-292-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have cluster_id, state index, we don't the cluster_id index as well.
| * | | | | | | Add index to improve query performanceThong Kuah2019-08-293-0/+23
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | For Environment.deployed_to_cluster
* | | | | | | Merge branch '63262-notes-are-persisted-with-the-user-s-locale' into 'master'Mayra Cabrera2019-08-283-4/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Notes are persisted with the user's locale" See merge request gitlab-org/gitlab-ce!32264
| * | | | | | | Do not persist translated system notes63262-notes-are-persisted-with-the-user-s-localeSean McGivern2019-08-283-4/+18
|/ / / / / / /
* | | | | | | Merge branch 'qa-ml-web-ide-commit-to-current-branch' into 'master'Dan Davison2019-08-282-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit to current branch by default in Web IDE E2E tests See merge request gitlab-org/gitlab-ce!32248
| * | | | | | | Commit to current branch by defaultqa-ml-web-ide-commit-to-current-branchMark Lapierre2019-08-282-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the Web IDE
* | | | | | | | Merge branch 'id-optimize-sql-requests-mr-show' into 'master'Mayra Cabrera2019-08-2811-36/+107
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of SQL requests on MR-show See merge request gitlab-org/gitlab-ce!32192
| * | | | | | | | Reduce the number of SQL requests on MR-showIgor2019-08-2811-36/+107
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extract MR fields for notes into a separate serializer - Check if pipelines are empty via count
* | | | | | | | Merge branch 'ce-xanf-move-file-icon-spec-to-jest' into 'master'65822-allow-smaller-ip-range-when-creating-gke-clusterClement Ho2019-08-282-92/+75
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Resolve "Migrate spec/javascripts/vue_shared/components/file_icon_spec.js to Jest" See merge request gitlab-org/gitlab-ce!32278
| * | | | | | | Refactored Karma spec to Jest for file_iconce-xanf-move-file-icon-spec-to-jestIllya Klymov2019-08-282-92/+75
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'issue_40630' into 'master'Michael Kozono2019-08-2814-15/+406
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save board lists collapsed setting Closes #52758 See merge request gitlab-org/gitlab-ce!31069
| * | | | | | | Save board lists collapsed settingFelipe Artur2019-08-2814-15/+406
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Persists if a board list is collapsed for each user.
* | | | | | | Merge branch 'fix-search-input-dropdown-scss' into 'master'Paul Slaughter2019-08-283-6/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix top-nav search bar dropdown on xl displays Closes #64120 and #66075 See merge request gitlab-org/gitlab-ce!31864
| * | | | | | | Fix top-nav search bar dropdown on xl displaysKemais Ehlers2019-08-283-6/+11
|/ / / / / / /
* | | | | | | Merge branch 'jv-gitaly-workhorse-feature-flags' into 'master'Michael Kozono2019-08-284-3/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Gitaly feature flags in workhorse Closes gitaly#1764 See merge request gitlab-org/gitlab-ce!31764
| * | | | | | | Support Gitaly feature flags in workhorseJacob Vosmaer2019-08-284-3/+25
|/ / / / / / /
* | | | | | | Merge branch 'docs-nelbacha-improve-grammar-and-code' into 'master'Tom Atkins2019-08-281-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve grammar and correct syntax in curl example See merge request gitlab-org/gitlab-ce!32163