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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update README.md	Andreas Kämmerle	2018-07-05	1	-0/+4
\|
*	Merge branch 'docs/container-scanning-note' into 'master'	Achilleas Pipinellis	2018-07-05	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Verify version on container scanning note See merge request gitlab-org/gitlab-ce!20409
\| *	Verify version on container scanning note	Cindy Pallares 🦉	2018-07-05	1	-2/+2
\| \|
* \|	Merge branch 'revert-8678cf9b' into 'master'	Grzegorz Bizon	2018-07-05	5	-8/+123
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'" See merge request gitlab-org/gitlab-ce!20402
\| * \|	Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"	Jacob Vosmaer (GitLab)	2018-07-05	5	-8/+123
\| \| \| \| \| \| \| \| \|	This reverts merge request !20339
* \| \|	Merge branch 'increase-capybara-js-timeout' into 'master'	Robert Speicher	2018-07-05	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase capybara JS request timeout Closes #48837 See merge request gitlab-org/gitlab-ce!20411
\| * \| \|	Increase capybara JS request timeout	Jacob Vosmaer (GitLab)	2018-07-05	1	-1/+3
\|/ / /
* \| \|	Merge branch 'go-code-cover' into 'master'	Kamil Trzciński	2018-07-05	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Go code coverage See merge request gitlab-org/gitlab-ce!20359
\| * \| \|	Add Go code coverage	Maxime Guyot	2018-07-04	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-timeouts' into 'master'	Rémy Coutable	2018-07-05	10	-49/+55
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Gitaly timeout values Closes gitaly#1254 See merge request gitlab-org/gitlab-ce!20259
\| * \| \| \|	Updated Gitaly timeout values	Andrew Newdigate	2018-07-05	10	-49/+55
\|/ / / /
* \| \| \|	Merge branch 'dm-invalid-active-service-template' into 'master'	Robert Speicher	2018-07-05	4	-3/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deactivate new KubernetesService created from active template to prevent project creation from failing Closes gitlab-ee#6753 See merge request gitlab-org/gitlab-ce!20400
\| * \| \| \|	Add changelog entry	Douwe Maan	2018-07-05	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Check whether new service created from template is valid after unflagging it ↵	Douwe Maan	2018-07-05	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as a template
\| * \| \| \|	Don't consider a new inactive KubernetesService invalid	Douwe Maan	2018-07-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'make-issues-base-service-match-ee' into 'master'	Rémy Coutable	2018-07-05	1	-2/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Issues::BaseService match EE Closes gitlab-ee#6561 See merge request gitlab-org/gitlab-ce!20405
\| * \| \| \| \|	Make Issues::BaseService match EE	Sean McGivern	2018-07-05	1	-2/+3
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have `#allows_multiple_assignees?` defined in CE too, and `take(1)` appears to be equivalent to `[0, 1]`.
* \| \| \| \|	Merge branch 'docs/api-mention-forked-from' into 'master'	Marcia Ramos	2018-07-05	1	-0/+33
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention the forked_from_project field in projects API Closes #41490 See merge request gitlab-org/gitlab-ce!20399
\| * \| \| \|	Mention the forked_from_project field in projects API	Achilleas Pipinellis	2018-07-05	1	-0/+33
\| \| \| \| \|
* \| \| \| \|	Merge branch 'port-c32af9da-to-ce' into 'master'	Sean McGivern	2018-07-05	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb See merge request gitlab-org/gitlab-ce!20407
\| * \| \| \| \|	Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb	Rémy Coutable	2018-07-05	1	-1/+1
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fj-web-terminal-ci-build' into 'master'	Douwe Maan	2018-07-05	20	-9/+344
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Web Terminal Ci Build Closes #47116 See merge request gitlab-org/gitlab-ce!19773
\| * \| \| \| \|	Web Terminal Ci Build	Francisco Javier López	2018-07-05	20	-9/+344
\|/ / / / /
* \| \| \| \|	Merge branch 'patch-19' into 'master'	Filipa Lacerda	2018-07-05	2	-2/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix double "in" in time to artifact deletion See merge request gitlab-org/gitlab-ce!20357
\| * \| \| \| \|	fix double "in" in time to artifact deletion	Ben Bodenmiller	2018-07-05	2	-2/+7
\|/ / / / /
* \| \| \| \|	Merge branch '48825-performance' into 'master'	Phil Hughes	2018-07-05	5	-94/+143
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improves performance on MR refactor and adds specs Closes #48825 See merge request gitlab-org/gitlab-ce!20380
\| * \| \| \| \|	Improves performance on MR refactor and adds specs	Filipa Lacerda	2018-07-05	5	-94/+143
\|/ / / / /
* \| \| \| \|	Merge branch 'tz-file-icons-in-mrs' into 'master'	Filipa Lacerda	2018-07-05	3	-10/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File Icons in Merge Requests Closes #48651 See merge request gitlab-org/gitlab-ce!20268
\| * \| \| \| \|	File Icons in Merge Requests	Tim Zallmann	2018-07-05	3	-10/+14
\|/ / / / /
* \| \| \| \|	Merge branch ↵	Phil Hughes	2018-07-05	4	-3/+17
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44697-when-editing-a-comment-in-an-issue-the-preview-mode-is-toggled-in-the-main-textarea' into 'master' Resolve "When editing a comment in an issue, the preview mode is toggled in the main textarea" Closes #44697 See merge request gitlab-org/gitlab-ce!20112
\| * \| \| \|	Resolve "When editing a comment in an issue, the preview mode is toggled in ↵	Constance Okoghenun	2018-07-05	4	-3/+17
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	the main textarea"
* \| \| \|	Merge branch 'issue_48474' into 'master'	Sean McGivern	2018-07-05	5	-1/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix discussion entity for legacy diff notes Closes #48474 See merge request gitlab-org/gitlab-ce!20214
\| * \ \ \	Merge branch 'issue_48474' of gitlab.com:gitlab-org/gitlab-ce into issue_48474	Felipe Artur	2018-07-04	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Remove space between curly brace	Felipe Artur	2018-06-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Render LegacyDiffNote when diff_file blob is nil	Felipe Artur	2018-07-04	3	-0/+20
\| \|/ / / /
\| * \| \| \|	Fix discussion entity for legacy diff notes	Felipe Artur	2018-06-27	2	-1/+20
\| \| \| \| \|
* \| \| \| \|	Merge branch 'i18n-extract-app/views/projects-snippets' into 'master'	Rémy Coutable	2018-07-05	6	-26/+44
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n: externalize strings from 'app/views/projects/snippets' See merge request gitlab-org/gitlab-ce!19828
\| * \| \| \| \|	i18n: externalize strings from 'app/views/projects/snippets'	Tao Wang	2018-07-01	6	-26/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tao Wang <twang2218@gmail.com>
* \| \| \| \| \|	Merge branch 'frozen-string-enable-app-uploaders' into 'master'	Rémy Coutable	2018-07-05	16	-1/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable frozen string in apps/uploaders/*.rb See merge request gitlab-org/gitlab-ce!20382
\| * \| \| \| \| \|	Enable frozen string in apps/validators/*.rb	gfyoung	2018-07-05	16	-1/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially addresses #47424.
* \| \| \| \| \| \|	Merge branch 'docs/use-ref-slug-for-docs-review' into 'master'	Rémy Coutable	2018-07-05	2	-12/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the review-docs workflow See merge request gitlab-org/gitlab-ce!20365
\| * \| \| \| \| \| \|	Simplify downstream branch name	Achilleas Pipinellis	2018-07-05	2	-10/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use CI_COMMIT_REF_SLUG for the env URL in review-docs jobs	Achilleas Pipinellis	2018-07-04	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rm-wrong-changelog' into 'master'	Rémy Coutable	2018-07-05	1	-5/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneeded changelog See merge request gitlab-org/gitlab-ce!20396
\| * \| \| \| \| \| \| \|	Remove unneeded changelog	Achilleas Pipinellis	2018-07-05	1	-5/+0
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changelog of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18027 was in the wrong location. [ci skip]
* \| \| \| \| \| \| \|	Merge branch 'remove-unnecessary-ignore-for-gitaly-n-plus-one' into 'master'	Douwe Maan	2018-07-05	2	-5/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary ignore for Gitaly N+1 Closes #47594 See merge request gitlab-org/gitlab-ce!20393
\| * \| \| \| \| \| \|	Remove Gitaly N+1 ignore from NotificationRecipientService spec	Sean McGivern	2018-07-04	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was because we were creating projects unnecessarily. These should be set as the `source` for the notification setting, not the `project`!
\| * \| \| \| \| \| \|	Clean up Gitaly N+1 stack traces	Sean McGivern	2018-07-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't need to know the details of every library involved in these calls; they will always originate in the GitLab app itself.
* \| \| \| \| \| \| \|	Merge branch '48779-qa-merge-request-squash-sometimes-fail' into 'master'	Sean McGivern	2018-07-05	2	-9/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "QA: Merge request squash sometimes fail" Closes #48779 See merge request gitlab-org/gitlab-ce!20375
\| * \| \| \| \| \| \| \|	[QA] Ensure we wait for the squash checbox to be clickable before clicking ↵	Rémy Coutable	2018-07-05	2	-9/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it in the squash scenario Signed-off-by: Rémy Coutable <remy@rymai.me>