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

	Commit message (Collapse)	Author	Age	Files	Lines
*	clarify what "methods" aredocs-styleguidelines-nav	Marcia Ramos	2018-06-20	1	-3/+4
\|
*	Update styleguide.md with rules for navigation items	Marcia Ramos	2018-06-20	1	-2/+15
\|
*	Merge branch 'gitaly-disk-access-5' into 'master'	Douwe Maan	2018-06-20	6	-1/+9
\|\ \| \| \| \| \| \| \| \|	More gitaly disk access blocks See merge request gitlab-org/gitlab-ce!19892
\| *	More gitaly disk access blocks	Jacob Vosmaer (GitLab)	2018-06-20	6	-1/+9
\|/
*	Merge branch 'ce-5024-filename-search' into 'master'	Sean McGivern	2018-06-20	8	-6/+186
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Implement filtering by filename on code search Closes #43627 See merge request gitlab-org/gitlab-ce!19509
\| *	Implement filtering by filename on code searchce-5024-filename-search	Mario de la Ossa	2018-06-19	8	-6/+186
\| \|
* \|	Merge branch '48105-git-version-detection-using-gitaly' into 'master'	Sean McGivern	2018-06-20	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move git version detection to gitaly for usage ping data Closes #48105 and charts/gitlab#530 See merge request gitlab-org/gitlab-ce!19993
\| * \|	Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitaly	Balasankar "Balu" C	2018-06-19	1	-1/+1
\| \| \|
* \| \|	Merge branch '47959-rails5-redis-timewithzone' into 'master'	Sean McGivern	2018-06-20	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Rails5] expected "2018-05-07 13:53:08 UTC" to be an instance of ActiveSupport::TimeWithZone" Closes #47959 See merge request gitlab-org/gitlab-ce!20000
\| * \| \|	Fix redis_cacheable deserialization47959-rails5-redis-timewithzone	Mario de la Ossa	2018-06-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-06-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Point out the specific anchor inside the document See merge request gitlab-org/gitlab-ce!19998
\| * \| \| \|	Point out the specific anchor inside the document	Matthieu Fronton	2018-06-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-lfs-pointers' into 'master'	Douwe Maan	2018-06-20	2	-94/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS changes are detected by Gitaly Closes gitaly#935 See merge request gitlab-org/gitlab-ce!19995
\| * \| \| \| \|	LFS changes are detected by Gitalyzj-lfs-pointers	Zeger-Jan van de Weg	2018-06-19	2	-94/+7
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/935
* \| \| \| \|	Merge branch 'text-expander-icon-update' into 'master'	Tim Zallmann	2018-06-20	6	-7/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated horizontal ellipsis icon for text-expander See merge request gitlab-org/gitlab-ce!18793
\| * \| \| \| \|	Updated horizontal ellipsis icon for text-expander	Constance Okoghenun	2018-06-20	6	-7/+28
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/correct-curl-syntax' into 'master'	Stan Hu	2018-06-20	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct cURL syntax See merge request gitlab-org/gitlab-ce!20014
\| * \| \| \| \|	Correct cURL syntax	Henrik Hüttemann	2018-06-20	1	-4/+4
\|/ / / / /
* \| \| \| \|	Merge branch '48025-branch-name-status-color-is-not-correct-anymore' into ↵	Tim Zallmann	2018-06-19	3	-5/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Branch name status color is not correct anymore" Closes #48025 See merge request gitlab-org/gitlab-ce!19973
\| * \| \| \| \|	Resolve "Branch name status color is not correct anymore"	Clement Ho	2018-06-19	3	-5/+9
\|/ / / / /
* \| \| \| \|	Merge branch 'leipert-proper-eslint-report' into 'master'	Mike Greiling	2018-06-19	2	-3/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use eslint cli option instead of sed See merge request gitlab-org/gitlab-ce!19939
\| * \| \| \| \|	use eslint config parameter instead of sedleipert-proper-eslint-report	Lukas Eipert	2018-06-16	2	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eslint has the possibility to ignore inline config `no-inline-config`, so we should use that
* \| \| \| \| \|	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>