delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix 500 error in CI lint when included templates are an arraysh-fix-ci-lint-500-error	Stan Hu	2019-08-31	4	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the following syntax would fail in the linter with an error 500: ``` include: template: - License-Management.gitlab-ci.yml - Dependency-Scanning.gitlab-ci.yml - SAST.gitlab-ci.yml ``` Now the error will call out specifically that the value is not a string. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66605
*	Merge branch '65063-Embeded-metrics-inconsistent-styles' into 'master'	Annabel Dunstone Gray	2019-08-29	2	-1/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed embedded metrics tooltip inconsistent styling Closes #65063 See merge request gitlab-org/gitlab-ce!31517
\| *	Fixed embedded metrics tooltip inconsistent styling	Olena Horal-Koretska	2019-08-29	2	-1/+16
\|/
*	Merge branch 'docs/jramsay/partial-clone-typo' into 'master'	Achilleas Pipinellis	2019-08-29	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Remove incorrectly structured url See merge request gitlab-org/gitlab-ce!32332
\| *	Remove bad url from partial clone docsdocs/jramsay/partial-clone-typo	James Ramsay	2019-08-29	1	-1/+1
\| \|
* \|	Merge branch 'chore/unnecessary-css-class-removal' into 'master'	Paul Slaughter	2019-08-29	6	-9/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary CSS class Closes #66163 See merge request gitlab-org/gitlab-ce!32320
\| * \|	Remove unnecessary CSS class	Arun Kumar Mohan	2019-08-28	6	-9/+9
\| \| \|
* \| \|	Merge branch 'sh-support-content-for-snippets-api' into 'master'	Kamil Trzciński	2019-08-29	3	-5/+56
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize use of `content` parameter in snippets API Closes #66673 See merge request gitlab-org/gitlab-ce!32296
\| * \| \|	Standardize use of `content` parameter in snippets APIsh-support-content-for-snippets-api	Stan Hu	2019-08-28	3	-5/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There was some confusion over whether `code` or `content` is the right parameter for snippets. Internally, the database stores `content`. However: 1. Project snippets use `code`. `code` gets remapped in `content` in `lib/api/project_snippets.rb`. 2. Personal snippets use `content`. To unify these APIs, allow an alias of `content` to work for project snippets. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66673
* \| \| \|	Merge branch '66524-issue-due-notification-emails-are-threaded-incorrectly' ↵	Kamil Trzciński	2019-08-29	3	-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-incorrectly	Heinrich Lee Yu	2019-08-29	3	-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 Coutable	2019-08-29	7	-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 closes	Nailia Iskhakova	2019-08-29	7	-3/+77
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add E2E spec to test that issue closes with commit message
* \| \| \| \|	Merge branch '66718-dast-extend-review-only' into 'master'	Rémy Coutable	2019-08-29	1	-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-only	Kyle Wiebers	2019-08-28	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-65629-rename-approvers-field' into 'master'	Achilleas Pipinellis	2019-08-29	1	-0/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update documentation screenshot See merge request gitlab-org/gitlab-ce!32369
\| * \| \| \| \| \|	Update documentation screenshot	Samantha Ming	2019-08-29	1	-0/+0
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-capitalization-4' into 'master'	Achilleas Pipinellis	2019-08-29	14	-57/+55
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix capitalization in more docs See merge request gitlab-org/gitlab-ce!32370
\| * \| \| \| \| \|	Fix capitalization in more docs	Marcel Amirault	2019-08-29	14	-57/+55
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix capitalization in docs for works like GitLab, Git Omnibus, etc
* \| \| \| \| \|	Merge branch 'docs/edit-autodevops-reqs' into 'master'	Achilleas Pipinellis	2019-08-29	1	-17/+29
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Auto DevOps requirements easier to read See merge request gitlab-org/gitlab-ce!32246
\| * \| \| \| \| \|	Make Auto DevOps requirements easier to read	Evan Read	2019-08-29	1	-17/+29
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'mk/simplify-internal-post-receive-messages' into 'master'	Grzegorz Bizon	2019-08-29	6	-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-messages	Michael Kozono	2019-08-28	6	-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 Pandya	2019-08-29	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New project milestone primary button See merge request gitlab-org/gitlab-ce!32355
\| * \| \| \| \| \| \|	Revert "DB change, migratoin and changelog"	Lee Tickett	2019-08-29	2	-1/+6
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* \| \| \| \| \| \|	Merge branch 'remove-checkbox-styling' into 'master'	Kushal Pandya	2019-08-29	1	-24/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove checkbox styling See merge request gitlab-org/gitlab-ce!31500
\| * \| \| \| \| \| \|	Remove checkbox styling	Justin Boyson	2019-08-29	1	-24/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'ce-xanf-move-auto-merge-failed-to-jest' into 'master'	Kushal Pandya	2019-08-29	3	-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-jest	Illya Klymov	2019-08-27	3	-47/+60
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Kushal Pandya	2019-08-29	4	-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-jobs	jakeburden	2019-08-28	4	-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 Pandya	2019-08-29	1	-3/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention Jest in testing guide docs See merge request gitlab-org/gitlab-ce!32324
\| * \| \| \| \| \| \| \| \|	Apply review suggestions	Mark Florian	2019-08-29	1	-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 Lopez	2019-08-29	3	-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-duplicates	Jacopo	2019-08-28	3	-15/+69
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs-redirected-links-4' into 'master'13085-license-information-in-dependency-list-add-documentation	Evan Read	2019-08-29	4	-8/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update a few redirected links Closes #64285 See merge request gitlab-org/gitlab-ce!32195
\| * \| \| \| \| \| \| \| \|	Update a few redirected links	Marcel Amirault	2019-08-29	4	-8/+8
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'performance-bar-warnings' into 'master'	Stan Hu	2019-08-29	9	-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-warnings	Sean McGivern	2019-08-28	3	-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 backend	Sean McGivern	2019-08-28	6	-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 Hu	2019-08-29	4	-1/+41
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index to improve query performance See merge request gitlab-org/gitlab-ce!31988
\| * \| \| \| \| \| \| \| \|	Remove redundant index	Thong Kuah	2019-08-29	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now we have cluster_id, state index, we don't the cluster_id index as well.
\| * \| \| \| \| \| \| \| \|	Add index to improve query performance	Thong Kuah	2019-08-29	3	-0/+23
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For Environment.deployed_to_cluster
* \| \| \| \| \| \| \| \|	Merge branch '63262-notes-are-persisted-with-the-user-s-locale' into 'master'	Mayra Cabrera	2019-08-28	3	-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-locale	Sean McGivern	2019-08-28	3	-4/+18
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'qa-ml-web-ide-commit-to-current-branch' into 'master'	Dan Davison	2019-08-28	2	-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-branch	Mark Lapierre	2019-08-28	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using the Web IDE
* \| \| \| \| \| \| \| \| \|	Merge branch 'id-optimize-sql-requests-mr-show' into 'master'	Mayra Cabrera	2019-08-28	11	-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-show	Igor	2019-08-28	11	-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-cluster	Clement Ho	2019-08-28	2	-92/+75
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Migrate spec/javascripts/vue_shared/components/file_icon_spec.js to Jest" See merge request gitlab-org/gitlab-ce!32278