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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move specs to ce directoryissue-6568-single-codebase-spec-controllers	Małgorzata Ksionek	2019-06-03	2	-0/+34
\|
*	Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'	Kushal Pandya	2019-06-03	1	-0/+14
\|\ \| \| \| \| \| \| \| \|	Style gitlab-ui checkboxes See merge request gitlab-org/gitlab-ce!28622
\| *	Style gitlab-ui checkboxes	Sam Bigelow	2019-05-30	1	-0/+14
\| \|
* \|	Merge branch 'patch-48' into 'master'	Ray Paik	2019-06-03	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix typos See merge request gitlab-org/gitlab-ce!29020
\| * \|	Fix typo	Philipp C. H	2019-06-01	1	-2/+2
\| \| \|
* \| \|	Merge branch 'patch-65' into 'master'	Ray Paik	2019-06-03	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in multiple_assignees_for_issues.md See merge request gitlab-org/gitlab-ce!29002
\| * \| \|	Update multiple_assignees_for_issues.md	Ilya Peterov	2019-05-31	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'sh-bump-ruby-concurrency-gem' into 'master'	Ash McKenzie	2019-06-03	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5 See merge request gitlab-org/gitlab-ce!29015
\| * \| \| \|	Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5sh-bump-ruby-concurrency-gem	Stan Hu	2019-06-01	1	-3/+3
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This matches the version used in Gitaly and avoids potential version conflicts when multiple versions are installed.
* \| \| \|	Merge branch 'docs/admin_area_runners' into 'master'	Evan Read	2019-06-03	2	-2/+53
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the Admin Area's Runners page See merge request gitlab-org/gitlab-ce!28852
\| * \| \| \|	Document the Admin Area's Runners page	Russell Dickenson	2019-06-03	2	-2/+53
\|/ / / /
* \| \| \|	Merge branch '60782-docs-redis-troubleshooting-replication' into 'master'	Evan Read	2019-06-03	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs feedback: Redis Troubleshooting Replication Closes #60782 See merge request gitlab-org/gitlab-ce!28936
\| * \| \|	Fix troubleshooting command to include host and quote password60782-docs-redis-troubleshooting-replication	Gabriel Mazetto	2019-05-30	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '61821-tooltip-consistency' into 'master'	Mike Greiling	2019-06-01	3	-11/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Tooltip Consistency" Closes #61821 See merge request gitlab-org/gitlab-ce!28839
\| * \| \| \|	Make tooltips consistently render on top	Justin Boyson	2019-06-01	3	-11/+17
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On edit-button simply set position to top. Made this change directly in template since edit-button is only used in one place. Had to wrap the comments toggle button in span tag to make tooltip show even when disabled as per bootstrap-vue docs. https://bootstrap-vue.js.org/docs/components/tooltip#overview Note: Also changexc button to gl-buttonto be consistent with rest of file.
* \| \| \|	Merge branch 'revert-2d980fad' into 'master'	Mike Greiling	2019-05-31	3	-8/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'js-i18n-board-store' into 'master'" See merge request gitlab-org/gitlab-ce!28977
\| * \| \| \|	Revert "Merge branch 'js-i18n-board-store' into 'master'"revert-2d980fad	Brandon Labuschagne	2019-05-31	3	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !28712
* \| \| \| \|	Merge branch 'osw-reset-merge-status-from-mergeable-mrs' into 'master'	Douglas Barbosa Alexandre	2019-05-31	7	-1/+172
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset merge status from mergeable MRs See merge request gitlab-org/gitlab-ce!28843
\| * \| \| \| \|	Reset merge status from mergeable MRs	Oswaldo Ferreira	2019-05-31	7	-1/+172
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds migrations to reset the merge_status of opened, mergeable MRs. That's required by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28513 so we're able to sync the status update along merge-ref, without leaving MRs with a stale merge-ref.
* \| \| \| \| \|	Merge branch '61339-Add-underline-to-attach-a-file' into 'master'	Annabel Dunstone Gray	2019-05-31	4	-17/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add hover and focus to "Attach a file" Closes #61339 See merge request gitlab-org/gitlab-ce!28682
\| * \| \| \| \| \|	Add hover and focus to "Attach a file"	Marcel van Remmerden	2019-05-31	4	-17/+31
\|/ / / / / /
* \| \| \| \| \|	Merge branch '56959-drop-project_auto_devops_domain' into 'master'	Robert Speicher	2019-05-31	6	-5/+21
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes project_auto_devops#domain column Closes #56959 See merge request gitlab-org/gitlab-ce!28574
\| * \| \| \| \|	Postmigrate to drop domain column56959-drop-project_auto_devops_domain	Thong Kuah	2019-05-31	3	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that the column is ignored, we can safely drop the column
\| * \| \| \| \|	Ignore ProjectAutoDevops domain column	Thong Kuah	2019-05-31	3	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This column is no longer used. The form was removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580 and other usages removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28460. Remove final usages of :domain
* \| \| \| \| \|	Merge branch 'docs-push-rule-committer-restriction' into 'master'	Drew Blessing	2019-05-31	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update 'committer restriction' push rule name See merge request gitlab-org/gitlab-ce!28994
\| * \| \| \| \| \|	Update 'committer restriction' push rule name	Drew Blessing	2019-05-31	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dz-scope-project-routes-3' into 'master'	Lin Jen-Shin	2019-05-31	10	-54/+83
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move some project routes under - scope See merge request gitlab-org/gitlab-ce!28830
\| * \| \| \| \| \|	Fix js api spec for new labels featuredz-scope-project-routes-3	Dmitriy Zaporozhets	2019-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Fix labels creating with new route	Dmitriy Zaporozhets	2019-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Add specs for Milestone reference methods	Dmitriy Zaporozhets	2019-05-29	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Add /-/ scope to link_reference_pattern	Dmitriy Zaporozhets	2019-05-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Fix specs after routing change	Dmitriy Zaporozhets	2019-05-29	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Move some project routes under - scope	Dmitriy Zaporozhets	2019-05-29	2	-45/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Affected project routes are: * services * boards * releases * forks * group_links * import * avatar * labels * milestones Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2019-05-31	6	-18/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61988-collapse-icon-on-merge-request-diff-larger-than-profile-picture' into 'master' Change collapse icon size to size of profile picture Closes #61988 See merge request gitlab-org/gitlab-ce!28512
\| * \| \| \| \| \| \|	Resize collapse icon to profile picture size	Marcel van Remmerden	2019-05-31	6	-18/+29
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '50850-kerrizor-extend-api-to-accept-start_project-option' into ↵	Lin Jen-Shin	2019-05-31	4	-0/+108
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add API support for committing changes to different projects in same fork network Closes #50850 See merge request gitlab-org/gitlab-ce!27915
\| * \| \| \| \| \| \|	Add optional param :start_project to allow variable commit targets	Kerri Miller	2019-05-31	4	-0/+108
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This extends POST#:id/repository/commits to allow the optional parameter `:start_project`, which will allow targeting other projects besides the one derived from `:id`. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/50850
* \| \| \| \| \| \|	Merge branch 'gitaly-version-v1.43.0' into 'master'	Bob Van Landuyt	2019-05-31	12	-156/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.43.0 See merge request gitlab-org/gitlab-ce!28867
\| * \| \| \| \| \| \|	Remove hook directory requirement from Shellgitaly-version-v1.43.0	Zeger-Jan van de Weg	2019-05-30	10	-155/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It used to be the case that GitLab created symlinks for each repository to one copy of the Git hooks, so these ran when required. This changed to set the hooks dynamically on Gitaly when invoking Git. The side effect is that we didn't need all these symlinks anymore, which Gitaly doesn't create anymore either. Now that means that the tests in GitLab-Rails should test for it either. Related: https://gitlab.com/gitlab-org/gitaly/issues/1392#note_175619926
\| * \| \| \| \| \| \|	Add changelog entry	GitalyBot	2019-05-30	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update Gitaly version to v1.43.0	GitalyBot	2019-05-30	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'weimeng-email-routing' into 'master'	Sean McGivern	2019-05-31	27	-68/+210
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add group-level email routing See merge request gitlab-org/gitlab-ce!25299
\| * \| \| \| \| \| \| \|	Apply reviewer suggestionsweimeng-email-routing	Wei-Meng Lee	2019-05-31	3	-5/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move method into group	Wei-Meng Lee	2019-05-31	2	-1/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Simplify logic using new group notification settings method	Wei-Meng Lee	2019-05-31	1	-17/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Guarantee order of notification settings	Wei-Meng Lee	2019-05-31	3	-14/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move group_notification_email outside conditional	Wei-Meng Lee	2019-05-31	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix typo in project invitation declined test	Wei-Meng Lee	2019-05-31	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add group-level notification emails to docs	Wei-Meng Lee	2019-05-31	2	-2/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Send notifications to group-specific email address	Wei-Meng Lee	2019-05-31	20	-44/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Select notification email by walking up group/subgroup path - Add settings UI to set group email notification address - Add tests