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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow disabling group/project email notifications	Brett Walker	2019-08-15	26	-73/+601
\| \| \| \| \| \|	- Adds UI to configure in group and project settings - Removes notification configuration for users when disabled at group or project level
*	Merge branch 'sh-update-rugged-0.28.3' into 'master'	Mayra Cabrera	2019-08-15	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Upgrade Rugged to 0.28.3.1 See merge request gitlab-org/gitlab-ce!31794
\| *	Upgrade Rugged to 0.28.3.1sh-update-rugged-0.28.3	Stan Hu	2019-08-15	2	-1/+6
\| \| \| \| \| \| \| \| \| \|	This is a security release: https://github.com/libgit2/libgit2/releases
* \|	Merge branch 'ashmckenzie/remove-duplicate-users-routes' into 'master'	Stan Hu	2019-08-15	1	-7/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate -/users/terms routes See merge request gitlab-org/gitlab-ce!31812
\| * \|	Remove duplicate -/users/terms routesashmckenzie/remove-duplicate-users-routes	Ash McKenzie	2019-08-14	1	-7/+0
\| \| \|
* \| \|	Merge branch 'dblessing-fix-public-project-ssh-only-ci-failure' into 'master'	Douglas Barbosa Alexandre	2019-08-15	3	-1/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow CI to clone public projects when HTTP protocol is disabled Closes #65805 See merge request gitlab-org/gitlab-ce!31632
\| * \| \|	Allow CI to clone public projects when HTTP protocol is disabled	Drew Blessing	2019-08-14	3	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab has a mechanism that allows CI to clone repositories via HTTP even when the HTTP protocol is disabled. This works as expected when a project is private or internal. However, when a project is public CI gets an error message that HTTP is not allowed. This happens because Git only sends auth in a subsequent request after a 401 is returned first. For public projects, GitLab grabs onto that unauthenticated request and sends it through since it recognizes that Guests are ordinarily allowed to access the repository. Later on this leads to a 403 since HTTP protocol is disabled. Fix this by only continuing with unauthenticated requests when HTTP is allowed.
* \| \| \|	Merge branch 'sh-fix-discussions-api-perf' into 'master'	Douglas Barbosa Alexandre	2019-08-15	3	-10/+74
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate many Gitaly calls in discussions API Closes #65957 See merge request gitlab-org/gitlab-ce!31834
\| * \| \| \|	Eliminate many Gitaly calls in discussions API	Stan Hu	2019-08-15	3	-10/+74
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, the API to retrieve discussions from merge requests often generated hundreds of Gitaly calls to determine whether a system note should be shown to the user. It did this by: 1. Rendering the Markdown 2. Extracting cross-references from the Markdown 3. For cross-references that were commits, a Gitaly FindCommit RPC would be issued to validate that the commit exists. The last step is unnecessary because we don't need to display a commit if the user doesn't have access to the project in the first place. `RendersNotes#prepare_notes_for_rendering` is already used in `MergeRequestsController`, which is why we don't see N+1 Gitaly calls there. We use it here to optimize the note redaction process. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65957
* \| \| \|	Merge branch 'fix-broken-ee-master-prepend-todos-api' into 'master'	Stan Hu	2019-08-15	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds EE prepend, which for some reason was missing See merge request gitlab-org/gitlab-ce!31851
\| * \| \| \|	Adds EE prepend, which for some reason was missingfix-broken-ee-master-prepend-todos-api	Alex Kalderimis	2019-08-15	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'georgekoltsov/48854-fix-empty-flash-message' into 'master'ce-update-ff-permissions-for-new-strategies	Stan Hu	2019-08-15	3	-11/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude json content type from workhorse interception See merge request gitlab-org/gitlab-ce!31809
\| * \| \| \| \|	Swap clauses as per code review suggestiongeorgekoltsov/48854-fix-empty-flash-message	George Koltsov	2019-08-15	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add changelog entry	George Koltsov	2019-08-14	1	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Exclude json content type from workhorse interception	George Koltsov	2019-08-14	2	-11/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '65278-livesum-puma-phase' into 'master'	Kamil Trzciński	2019-08-15	3	-6/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove :puma_phase metrics See merge request gitlab-org/gitlab-ce!31773
\| * \| \| \| \| \|	Remove :puma_phase metrics65278-livesum-puma-phase	Aleksei Lipniagov	2019-08-14	3	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't use phase restarts, as we use `preload_app`: https://github.com/puma/puma/blob/master/README.md#clustered-mode `:puma_phase` values will always be zero.
* \| \| \| \| \| \|	Merge branch 'ld-remove-prepend' into 'master'	Ash McKenzie	2019-08-15	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove prepend_if_ee from CE codebase See merge request gitlab-org/gitlab-ce!31845
\| * \| \| \| \| \| \|	Remove prepend_if_ee from CE codebase	Luke Duncalfe	2019-08-15	1	-2/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31789
* \| \| \| \| \| \|	Merge branch ↵	Ash McKenzie	2019-08-15	3	-10/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'13494-todo-s-not-rendering-when-there-is-a-design-management-related-todo-ce' into 'master' CE backport of gitlab-org/gitlab-ee!15129 (Allow Todos to link to Designs) See merge request gitlab-org/gitlab-ce!31789
\| * \| \| \| \| \| \|	CE-specific changes to allow design Todos13494-todo-s-not-rendering-when-there-is-a-design-management-related-todo-ce	Luke Duncalfe	2019-08-15	3	-10/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE-specific changes for: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15129 Co-Authored-By: Alex Kalderimis <akalderimis@gitlab.com> Co-Authored-By: Luke Duncalfe <lduncalfe@eml.cc>
* \| \| \| \| \| \| \|	Merge branch 'allow-focus-in-specs' into 'master'	Bob Van Landuyt	2019-08-15	2	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to use focus: true in specs See merge request gitlab-org/gitlab-ce!31691
\| * \| \| \| \| \| \| \|	Mention focus: true in the specsallow-focus-in-specs	Giorgenes Gelatti	2019-08-13	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow to use focus: true in specs	Giorgenes Gelatti	2019-08-11	1	-0/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ashmckenzie/docs-ce-ee-merge-at-gitlab' into 'master'	Evan Read	2019-08-15	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add section on how we run CE->EE merge at GitLab See merge request gitlab-org/gitlab-ce!31659
\| * \| \| \| \| \| \| \| \|	Add section on how we run CE->EE merge at GitLab	Ash McKenzie	2019-08-15	1	-0/+13
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs-push-options-since' into 'master'	Achilleas Pipinellis	2019-08-15	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation: tell when push options were introduced See merge request gitlab-org/gitlab-ce!31836
\| * \| \| \| \| \| \| \| \|	Documentation: tell when push options were introduced	Christian Couder	2019-08-15	1	-0/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs/dependency-list-dependency-scanning' into 'master'	Evan Read	2019-08-15	7	-10/+57
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update/expand docs for the Dependency List. See merge request gitlab-org/gitlab-ce!31147
\| * \| \| \| \| \| \| \| \|	Update/expand docs for the Dependency List	Mark Florian	2019-08-15	7	-10/+57
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These changes align the docs with the features introduced in [1]. See also the [issue tracking the documentation changes][2]. [1]: https://gitlab.com/gitlab-org/gitlab-ee/issues/10077 [2]: https://gitlab.com/gitlab-org/gitlab-ee/issues/12986
* \| \| \| \| \| \| \| \|	Merge branch 'sethgitlab-description-templates' into 'master'	Achilleas Pipinellis	2019-08-15	5	-10/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update description templates screenshots See merge request gitlab-org/gitlab-ce!31623
\| * \| \| \| \| \| \| \| \|	Update description templates screenshots	Seth Berger	2019-08-15	5	-10/+10
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated screenshots about description templates in the project settings documentation. Closes #https://gitlab.com/gitlab-org/gitlab-ce/issues/65738
* \| \| \| \| \| \| \| \|	Merge branch 'ce-11982-merge-trains-helper-text' into 'master'	Paul Slaughter	2019-08-15	5	-8/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!14097: Add merge train helper text to merge request widget See merge request gitlab-org/gitlab-ce!30686
\| * \| \| \| \| \| \| \| \|	Add merge train helper text to MR widget (CE)ce-11982-merge-trains-helper-text	Nathan Friend	2019-08-14	5	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds a helper text that describes what will happen when a user clicks the "Start/Add to merge train when pipeline succeeds" button. This text appears at the bottom of the merge request widget. In addition, this commit renames the "merge_train_info" component to "merge_train_position_indicator" to avoid ambiguity with the "merge_train_helper_text" component.
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-ek-update-text-to-read-productivity' into 'master'	Evan Read	2019-08-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update text: Cycle -> Productivity See merge request gitlab-org/gitlab-ce!31830
\| * \| \| \| \| \| \| \| \|	Update text Cycle -> Productivity	Ezekiel Kigbo	2019-08-15	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'valexieva-master-patch-02708' into 'master'	Evan Read	2019-08-15	1	-4/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes to cycle analytics docs See merge request gitlab-org/gitlab-ce!31572
\| * \| \| \| \| \| \| \| \|	Changes to cycle analytics docs	Virjinia Alexieva	2019-08-15	1	-4/+24
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs/add-free-tier-badge' into 'master'	Evan Read	2019-08-15	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing (FREE ONLY) docs tier badge See merge request gitlab-org/gitlab-ce!31755
\| * \| \| \| \| \| \| \| \|	Add missing (FREE ONLY) docs tier badgedocs/add-free-tier-badge	Achilleas Pipinellis	2019-08-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-multi-assignees-starter' into 'master'	Evan Read	2019-08-15	1	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that assigning many people is starter feature See merge request gitlab-org/gitlab-ce!30700
\| * \| \| \| \| \| \| \| \| \|	Note that assigning many people is starter feature	Ben Bodenmiller	2019-08-15	1	-1/+6
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-72' into 'master'	Evan Read	2019-08-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Mattermost System Console settings page URL for webhooks See merge request gitlab-org/gitlab-ce!31334
\| * \| \| \| \| \| \| \| \| \|	Update Mattermost System Console settings page URL for webhooks	Jason Blais	2019-08-15	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'productivity-analytics-docs' into 'master'	Evan Read	2019-08-14	1	-0/+69
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs page for productivity_analytics See merge request gitlab-org/gitlab-ce!31460
\| * \| \| \| \| \| \| \| \| \|	Add docs page for productivity_analytics	Martin Wortschack	2019-08-14	1	-0/+69
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-rubocop-target-ruby-version' into 'master'	Stan Hu	2019-08-14	5	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make ruby 2.6 the officially supported version See merge request gitlab-org/gitlab-ce!31675
\| * \| \| \| \| \| \| \| \| \|	Make ruby 2.6 the officially supported version	Hordur Freyr Yngvason	2019-08-14	5	-7/+7
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2019-08-14	12	-73/+83
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'64950-move-download-csv-button-functionality-in-metrics-dashboard-cards-into-the-dropdown' into 'master' Move download CSV functionality to dropdown in metrics Closes #64950 See merge request gitlab-org/gitlab-ce!31679
\| * \| \| \| \| \| \| \| \| \|	Adds download CSV functionality to dropdown in metrics	Laura Montemayor	2019-08-14	12	-73/+83
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR adds the functionality to download metrics data as CSV. It also removes the exportMetricsToCsvEnabled feature flag which was used before the dropdown was implemented to display a button.