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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Guard against nil dereferenced_targetjc-guard-against-empty-dereferenced_target	John Cai	2019-04-10	3	-1/+13
\|
*	Merge branch 'docs-60290-docs-lint-broken-in-master' into 'master'50130-cluster-cluster-details-update-automatically-after-cluster-is-created	Achilleas Pipinellis	2019-04-09	5	-0/+0
\|\ \| \| \| \| \| \| \| \|	Change mode to 644 for doc/ci/variables/img/ See merge request gitlab-org/gitlab-ce!27179
\| *	Change mode to 644 for doc/ci/variables/img/docs-60290-docs-lint-broken-in-master	Rémy Coutable	2019-04-09	5	-0/+0
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '60305-fix-mr-assignee-for-mr-push-options' into 'master'	Douglas Barbosa Alexandre	2019-04-09	2	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR assignees for push options Closes #60305 See merge request gitlab-org/gitlab-ce!27186
\| * \|	Fix MR assignees for push options	Nick Thomas	2019-04-09	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With multiple MR assignees, `merge_request.assignee_id` is always nil, and `merge_request.assignee_ids` isn't in `merge_request.attributes`. So the existing code doesn't set assignees in the created MR. This fix gets all the tests passing, but we should also check that no other associations in the MergeRequest need similar fixups.
* \| \|	Merge branch 'quarantine-flaky-test' into 'master'	Douglas Barbosa Alexandre	2019-04-09	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Quarantine flaky test: "Discussion Comments Issue behaves like discussion comments clicking "Comment" will post a comment" / spec/support/features/discussion_comments_shared_example.rb:19 See merge request gitlab-org/gitlab-ce!27183
\| * \|	Quarantine flaky test	Michael Kozono	2019-04-09	1	-1/+1
\| \| \|
* \| \|	Merge branch ↵	Robert Speicher	2019-04-09	1	-17/+23
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	'6649-extract-ee-specific-files-lines-for-ci-cd-app-serializers' into 'master' Extract preloaded_relations See merge request gitlab-org/gitlab-ce!27168
\| * \|	Extract preloaded_relations into method6649-extract-ee-specific-files-lines-for-ci-cd-app-serializers	Matija Čupić	2019-04-09	1	-17/+23
\| \| \|
* \| \|	Merge branch 'remove-disabled-pages-domains' into 'master'	Nick Thomas	2019-04-09	12	-33/+154
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark disabled pages domain for removal See merge request gitlab-org/gitlab-ce!26212
\| * \| \|	Mark unverified pages domains for removal	Vladimir Shushlin	2019-04-09	12	-33/+154
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set pages_domain.remove_at when disabling it Add specs for marking pages domain for removal Notify user that domain is being removed Add documentation
* \| \|	Merge branch 'docs-zj-update-n-plus-one-comments' into 'master'	Douglas Barbosa Alexandre	2019-04-09	7	-7/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update comments about N + 1 Gitaly calls See merge request gitlab-org/gitlab-ce!27178
\| * \| \|	Update comments about N + 1 Gitaly calls	Zeger-Jan van de Weg	2019-04-09	7	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To make sure all known issues are linked to the correct epic, I've gone through the code base, and updated the comments where required.
* \| \| \|	Merge branch 'quarantine-flaky-specs' into 'master'	Kamil Trzciński	2019-04-09	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine a flaky spec in spec/features/issues/user_interacts_with_awards_spec.rb See merge request gitlab-org/gitlab-ce!27176
\| * \| \| \|	Quarantine a flaky spec in ↵	Rémy Coutable	2019-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/features/issues/user_interacts_with_awards_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch '60249' into 'master'	Annabel Dunstone Gray	2019-04-09	1	-0/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix SVG icon colors in Related MRs widget Closes #60249 See merge request gitlab-org/gitlab-ce!27151
\| * \| \| \| \|	Fix icon colors of related MRs widget60249	Fatih Acet	2019-04-09	1	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'do-not-reopen-merged-mr' into 'master'	Mike Greiling	2019-04-09	3	-3/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove a "reopen merge request button" on a "merged" merge request Closes #54039 See merge request gitlab-org/gitlab-ce!26965
\| * \| \| \| \| \|	Remove a "reopen merge request button" on a "merged" merge request	Hiroyuki Sato	2019-04-04	3	-3/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '60229-curl-review-app-for-200-response' into 'master'	Lin Jen-Shin	2019-04-09	1	-50/+51
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Make the `review-deploy` curl the Review App for a 200 response to decide success" Closes #60229 See merge request gitlab-org/gitlab-ce!27134
\| * \| \| \| \| \| \|	Conform scripts/review_apps/review-apps.sh to shellcheck	Rémy Coutable	2019-04-09	1	-55/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Poll Review App after it's deployed to ensure it's accessible	Rémy Coutable	2019-04-09	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'if-57131-external_auth_to_ce' into 'master'	Andreas Brandl	2019-04-09	103	-35/+3058
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of Move "Authorize project access with external service" to Core See merge request gitlab-org/gitlab-ce!27056
\| * \| \| \| \| \| \|	Move Contribution Analytics related spec in ↵	Imre Farkas	2019-04-09	103	-35/+3058
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/features/groups/group_page_with_external_authorization_service_spec to EE
* \| \| \| \| \| \|	Merge branch 'osw-multi-assignees-merge-requests' into 'master'	Nick Thomas	2019-04-09	126	-809/+1181
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
\| * \| \| \| \| \| \|	[CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requests	Oswaldo Ferreira	2019-04-08	126	-809/+1181
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* \| \| \| \| \| \| \|	Merge branch 'patch-50' into 'master'	Marcia Ramos	2019-04-09	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar and try to make clearer how a fork works See merge request gitlab-org/gitlab-ce!26929
\| * \| \| \| \| \| \| \|	Fix grammar and try to make clearer how a fork works	mlncn	2019-04-03	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Marcia Ramos	2019-04-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add missing word in docs See merge request gitlab-org/gitlab-ce!26882
\| * \| \| \| \| \| \| \|	Fix typo in docs	chow89	2019-04-02	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'expose-trigger-variables-via-api' into 'master'	Kamil Trzciński	2019-04-09	7	-0/+176
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose pipeline variables via API Closes #28105 See merge request gitlab-org/gitlab-ce!26501
\| * \| \| \| \| \| \| \| \|	Add new permission model `read-pipeline-variable`	Agustin Henze	2019-04-09	7	-0/+176
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Used to get the variables via the API endpoint `/projects/:id/pipelines/:pipeline_id/variables` Signed-off-by: Agustin Henze <tin@redhat.com>
* \| \| \| \| \| \| \| \|	Merge branch 'winh-jest-no-identical-title' into 'master'	Clement Ho	2019-04-09	2	-48/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ESLint rule jest/no-identical-title See merge request gitlab-org/gitlab-ce!27139
\| * \| \| \| \| \| \| \| \|	Refactor diff_spec.js to use table-based testswinh-jest-no-identical-title	Winnie Hellmann	2019-04-08	1	-48/+45
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Enable ESLint rule jest/no-identical-title	Winnie Hellmann	2019-04-08	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '10962' into 'master'	Clement Ho	2019-04-09	1	-4/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused CSS class in Related MRs widget Closes gitlab-ee#10962 See merge request gitlab-org/gitlab-ce!27150
\| * \| \| \| \| \| \| \| \| \|	Remove unused CSS class in Related MRs widget10962	Fatih Acet	2019-04-09	1	-4/+1
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'always-link-instance-configuration' into 'master'	Fatih Acet	2019-04-09	2	-2/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always show instance configuration link Closes #59730 See merge request gitlab-org/gitlab-ce!26783
\| * \| \| \| \| \| \| \| \| \|	Always show instance configuration link	Bastian Blank	2019-04-02	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The link to the useful instance configuration page was hidden behind the commercial content setting. Just display it always.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'stable-reviewer-roulette' into 'master'	Douglas Barbosa Alexandre	2019-04-09	1	-4/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stable reviewer roulette Closes #57766 See merge request gitlab-org/gitlab-ce!27117
\| * \| \| \| \| \| \| \| \| \|	Pick reviewers based on branch namestable-reviewer-roulette	Sean McGivern	2019-04-08	1	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change reviewer roulette to always pick the same reviewers for the same branch name. We do this by: 1. Making the branch name 'canonical' across CE and EE by stripping a leading 'ce-' or 'ee-' and a trailing '-ce' or '-ee'. If people are following our branch naming guidelines, this should give the same branch name in both repos. 2. Converting the branch name to a stable integer by taking the integer form of its MD5. 3. Passing that integer as a seed to Ruby's `Random` class, which 'may be used to ensure repeatable sequences of pseudo-random numbers between different runs of the program' (from the Ruby documentation). The upshot is that the same branch name (in CE and EE) should always pick the same reviewers, and those should be evenly distributed across the set of possible reviewers due to the use of MD5.
\| * \| \| \| \| \| \| \| \| \|	Add issue links to Danger roulette comments	Sean McGivern	2019-04-08	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'documentation-bug-public-key-should-be-private-key' into 'master'	Nick Thomas	2019-04-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs public key -> private key See merge request gitlab-org/gitlab-ce!26902
\| * \| \| \| \| \| \| \| \| \| \|	public key -> private key	Joan Queralt	2019-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '59570-due-quick-action' into 'master'	James Lopez	2019-04-09	2	-43/+26
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract due quick action to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26918
\| * \| \| \| \| \| \| \| \| \| \| \|	Extract due quick action to shared example59570-due-quick-action	Alexandru Croitor	2019-04-08	2	-43/+26
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'quarantine-flaky-specs' into 'master'	Lin Jen-Shin	2019-04-09	4	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine flaky specs See merge request gitlab-org/gitlab-ce!27170
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine flaky specs	Rémy Coutable	2019-04-09	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to: - https://gitlab.com/gitlab-org/gitlab-ce/issues/60270 - https://gitlab.com/gitlab-org/gitlab-ce/issues/60271 - https://gitlab.com/gitlab-org/gitlab-ce/issues/60272 - https://gitlab.com/gitlab-org/gitlab-ce/issues/60273 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '43263-git-push-option-to-create-mr' into 'master'	Nick Thomas	2019-04-09	17	-36/+943
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Git push options to create a merge request, set target_branch and set merge when pipeline succeeds Closes #53198 and #43263 See merge request gitlab-org/gitlab-ce!26752
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Update service to handle unexpected exceptions43263-git-push-option-to-create-mr	Luke Duncalfe	2019-04-09	2	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will ensure that now and in the future, PushOptionsHandlerService will not cause the post_receive API endpoint from running other code if something causes an unknown exception.