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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Rename Discussion team to Plan teamrename-discussion-plan	Victor Wu	2018-06-19	1	-2/+2
\|
*	Merge branch '46250-remove-commented-from-comment-system-notes' into 'master'	Mike Greiling	2018-06-19	3	-4/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove “commented” from comment system notes" Closes #46250 See merge request gitlab-org/gitlab-ce!19709
\| *	Resolve "Remove “commented” from comment system notes"	Constance Okoghenun	2018-06-19	3	-4/+0
\|/
*	Merge branch 'jl-update-jupyterhub-docs' into 'master'	Marcia Ramos	2018-06-19	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update JupyterHub docs with additional details See merge request gitlab-org/gitlab-ce!19981
\| *	Clarify jupyterhub docs to indicate OAuth is enabled and HTTPS is not yet ↵jl-update-jupyterhub-docs	Joshua Lambert	2018-06-19	1	-1/+1
\| \| \| \| \| \| \| \|	supported.
* \|	Merge branch 'qa-improve-main-login-page' into 'master'bjk/gh_importer_labels	Robert Speicher	2018-06-19	2	-31/+37
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make Page::Main::Login#sign_in_using_credentials gracefully bail out when user is already logged-in See merge request gitlab-org/gitlab-ce!19964
\| * \|	Make Page::Main::Login#sign_in_using_credentials gracefully bail out when ↵qa-improve-main-login-page	Rémy Coutable	2018-06-19	2	-31/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user is already logged-in Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'	Clement Ho	2018-06-19	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cancel automatic merge button height Closes #48052 See merge request gitlab-org/gitlab-ce!19977
\| * \| \|	Fix cancel automatic merge button height	Jose	2018-06-19	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'dm-branch-api-can-push' into 'master'	Robert Speicher	2018-06-19	4	-4/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose whether current user can push into a branch on branches API See merge request gitlab-org/gitlab-ce!19958
\| * \| \| \|	Expose whether current user can push into a branch on branches APIdm-branch-api-can-push	Douwe Maan	2018-06-18	4	-4/+19
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'	Tim Zallmann	2018-06-19	2	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing underline on focus states for anchor tags Closes #47748 See merge request gitlab-org/gitlab-ce!19873
\| * \| \| \| \|	Fix missing underline on focus states for anchor tagsjivl-fix-focused-links-missing-underline	Jose	2018-06-15	2	-0/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-flakey-groups-filter-list-specs' into 'master'	Rémy Coutable	2018-06-19	2	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix flakey time-senstive group filter specs See merge request gitlab-org/gitlab-ce!19880
\| * \| \| \| \| \|	Fix flakey time-senstive group filter specsfix-flakey-groups-filter-list-specs	Eric Eastwood	2018-06-14	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This passed previously because the filtered group search is debounced by 0.5s. The test cleared the input, entered `group1`, cleared the input, entered nothing, and the all of groups are still listed because of the 0.5s debounce hasn't triggered and the test passes before anything is actually filtered. Even if we assert that the list is filtered before clearing the input, the test still fails because the nature of the `fill_in 'filter', with: ""` method is that ["if you're setting the value to "", no keys are ever actually sent, hence no [`input`] event"](https://github.com/teamcapybara/capybara/issues/203#issuecomment-557281) and we never filter back to everything in the list. So the solution is two-fold, add in the assertions that the list is actually filtered after each step. Then use a method that fills the input with proper events fired.
* \| \| \| \| \| \|	Merge branch '48047-project-integrations' into 'master'	Clement Ho	2018-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Frontend issues in integrations page" See merge request gitlab-org/gitlab-ce!19970
\| * \| \| \| \| \| \|	Fix integration table widths48047-project-integrations	Annabel Dunstone Gray	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-force-push-opt-out' into 'master'	Douwe Maan	2018-06-19	5	-46/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force push is handled by Gitaly now Closes gitaly#348 See merge request gitlab-org/gitlab-ce!19992
\| * \| \| \| \| \| \| \|	Force push is handled by Gitaly nowzj-force-push-opt-out	Zeger-Jan van de Weg	2018-06-19	5	-46/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitaly#348
* \| \| \| \| \| \| \| \|	Merge branch 'zj-fork-mandatory' into 'master'	Douwe Maan	2018-06-19	4	-71/+16
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move forking to Gitaly Closes gitaly#817 and gitaly#1236 See merge request gitlab-org/gitlab-ce!19990
\| * \| \| \| \| \| \| \|	Move forking to Gitalyzj-fork-mandatory	Zeger-Jan van de Weg	2018-06-19	4	-71/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/817 Closes https://gitlab.com/gitlab-org/gitaly/issues/1236
* \| \| \| \| \| \| \| \|	Merge branch 'zj-counting-commits' into 'master'	Douwe Maan	2018-06-19	3	-80/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Counting commits is done by Gitaly Closes gitaly#382 See merge request gitlab-org/gitlab-ce!19983
\| * \| \| \| \| \| \| \|	Counting commits is done by Gitalyzj-counting-commits	Zeger-Jan van de Weg	2018-06-19	3	-80/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/382
* \| \| \| \| \| \| \| \|	Merge branch '45487-slack-tag-push-notifs' into 'master'	Sean McGivern	2018-06-19	3	-17/+70
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Slack Tag push notifications are not send (only default branch option)" Closes #45487 See merge request gitlab-org/gitlab-ce!19864
\| * \| \| \| \| \| \| \| \|	ChatNotificationService - fix sending tag notifications when "only default ↵45487-slack-tag-push-notifs	Mario de la Ossa	2018-06-14	3	-17/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	branch" enabled
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-optimize-locks-check-ce' into 'master'	Sean McGivern	2018-06-19	5	-1/+44
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in LFS file lock checks during a push See merge request gitlab-org/gitlab-ce!19978
\| * \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in LFS file locks checks during a pushsh-optimize-locks-check-ce	Stan Hu	2018-06-18	5	-1/+44
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This significantly improves performance when a user pushes many references. project.path_locks.any? doesn't cache the output and runs `SELECT 1 AS one FROM "path_locks" WHERE project_id = N` each time. When there are thousands of refs being pushed, this can time out the unicorn worker. CE port for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6159.
* \| \| \| \| \| \| \| \| \|	Merge branch 'more-group-api-sorting-options' into 'master'	Douwe Maan	2018-06-19	5	-8/+60
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix group pagination and add sort by id to groups and subgroups Closes #47409 See merge request gitlab-org/gitlab-ce!19665
\| * \| \| \| \| \| \| \| \| \|	Add id as second sort parameter for group sort by name	Marko, Peter	2018-06-18	3	-2/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding primary key to database query order rule generates deterministic sort result and thus pagination. This is needed because subgroups can have identical names. Signed-off-by: Marko, Peter <peter.marko@siemens.com>
\| * \| \| \| \| \| \| \| \| \|	Ensure ordering for group sorting tests	Marko, Peter	2018-06-15	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of manually creating list to compare the test result, use system sort to assure no errors are introduced. Signed-off-by: Marko, Peter <peter.marko@siemens.com>
\| * \| \| \| \| \| \| \| \| \|	Add id group api sorting option	Marko, Peter	2018-06-12	4	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With introduction of subgroups, many groups may have the same name and/or path, thus further sorting options are necessary. Signed-off-by: Marko, Peter <peter.marko@siemens.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'extra-ee-specific-lines-from-discussion-views' into 'master'	Rémy Coutable	2018-06-19	7	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract EE-specific lines from discussion views See merge request gitlab-org/gitlab-ce!19831
\| * \| \| \| \| \| \| \| \| \| \|	Remove EE-specific code from new MR emailextra-ee-specific-lines-from-discussion-views	Sean McGivern	2018-06-18	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove EE-specific code from rejection mailer	Sean McGivern	2018-06-18	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove EE-specific code from logs tree dropdown	Sean McGivern	2018-06-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove EE-specific code from project milestone page	Sean McGivern	2018-06-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove EE-specific code from blob header	Sean McGivern	2018-06-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/contributing-md-labels' into 'master'	Rémy Coutable	2018-06-19	1	-34/+48
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove label examples from headings See merge request gitlab-org/gitlab-ce!19982
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove label examples from headings	Achilleas Pipinellis	2018-06-19	1	-34/+48
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better make it clearer under each section what the labels are rather than listing a subset of them in the section title
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-linguist-gitaly-mandatory' into 'master'	Douwe Maan	2018-06-19	1	-27/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move language detection to mandatory Closes gitaly#732 and gitaly#360 See merge request gitlab-org/gitlab-ce!19985
\| * \| \| \| \| \| \| \| \| \| \| \|	Move language detection to mandatory	Zeger-Jan van de Weg	2018-06-19	1	-27/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/732 Closes https://gitlab.com/gitlab-org/gitaly/issues/360
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-gitaly-squash' into 'master'	Douwe Maan	2018-06-19	1	-27/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rebase and Squash in progress are Gitaly only Closes gitaly#865 and gitaly#1018 See merge request gitlab-org/gitlab-ce!19987
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Rebase and Squash in progress are Gitaly only	Zeger-Jan van de Weg	2018-06-19	1	-27/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/865 Closes https://gitlab.com/gitlab-org/gitaly/issues/1018
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-info-attributes' into 'master'	Douwe Maan	2018-06-19	1	-15/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move info attributes to mandatory Closes gitaly#1082 See merge request gitlab-org/gitlab-ce!19988
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Move info attributes to mandatory	Zeger-Jan van de Weg	2018-06-19	1	-15/+1
\| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/1082
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-commit-count' into 'master'	Douwe Maan	2018-06-19	1	-18/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move count commit to mandatory Closes gitaly#330 See merge request gitlab-org/gitlab-ce!19984
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Move count commit to mandatory	Zeger-Jan van de Weg	2018-06-19	1	-18/+2
\| \| \|_\|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/330
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-gitaly-license-detection' into 'master'	Douwe Maan	2018-06-19	2	-31/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	License detection happens solely through Gitaly now Closes gitaly#1026 See merge request gitlab-org/gitlab-ce!19986
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	License detection happens soley through Gitaly now	Zeger-Jan van de Weg	2018-06-19	2	-31/+11
\| \| \|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migration: https://gitlab.com/gitlab-org/gitaly/issues/1026 Conflicts: lib/gitlab/git/repository.rb
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace-omniauth.org-sedo-doc' into 'master'	Rémy Coutable	2018-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix omniauth link, site has moved. See merge request gitlab-org/gitlab-ce!19957