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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make SidekiqStatus able to count number of jobs completed/runningsh-improve-sidekiq-status	Stan Hu	2017-03-03	2	-6/+55
\|
*	Merge branch 'revert-320ef318' into 'master'	Filipa Lacerda	2017-03-03	2	-8/+0
\|\ \| \| \| \| \| \| \| \|	Revert "Merge branch 'tooltip-hide-on-scroll' into 'master'" See merge request !9693
\| *	Revert "Merge branch 'tooltip-hide-on-scroll' into 'master'"revert-320ef318	Phil Hughes	2017-03-03	2	-8/+0
\| \| \| \| \| \|	This reverts merge request !9653
* \|	Merge branch 'patch-16' into 'master'	Achilleas Pipinellis	2017-03-03	1	-3/+53
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add Microsoft Exchange reply by email details Closes #28131 See merge request !9482
\| * \|	add Microsoft Exchange reply by email details	Ben Bodenmiller	2017-02-23	1	-3/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #28131 [skip ci]
* \| \|	Merge branch '26847-api-pipelines-use-basic' into 'master'	Robert Speicher	2017-03-03	8	-40/+250
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose pipelines as PipelineBasic `api/v4/projects/:id/pipelines` Closes #26847 See merge request !8875
\| * \|	Expose pipelines as PipelineBasic `projects/:id/pipelines`26847-api-pipelines-use-basic	Toon Claes	2017-03-03	8	-40/+250
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `projects/:id/pipelines` exposed a lot of extra details that are superfluous and it was taking extra resources to fetch them. To get more details about a pipeline, use `projects/:id/pipelines/:pipeline_id`.
* \| \|	Merge branch 'set-kube-ca-pem-to-file' into 'master'	Kamil Trzciński	2017-03-03	4	-2/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM Closes #25753 See merge request !9398
\| * \| \|	Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM	Nick Thomas	2017-03-03	4	-2/+18
\|/ / /
* \| \|	Merge branch 'dm-fix-cherry-pick' into 'master'	Robert Speicher	2017-03-03	13	-119/+111
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cherry-picking or reverting through an MR Closes #28711 and #28426 See merge request !9640
\| * \| \|	Remove useless assignmentdm-fix-cherry-pick	Douwe Maan	2017-03-03	1	-1/+1
\| \| \| \|
\| * \| \|	Use separate error class for cherry-pick and revert tree errors	Douwe Maan	2017-03-02	2	-11/+8
\| \| \| \|
\| * \| \|	Fix cherry-picking or reverting through an MR	Douwe Maan	2017-03-02	13	-117/+112
\| \| \| \|
* \| \| \|	Merge branch '28865-filter-by-authorized-projects-in-v4' into 'master'	Sean McGivern	2017-03-03	6	-25/+65
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filter param for user's authorized projects in V4 Closes #28865 See merge request !9674
\| * \| \| \|	Rename query parameter to `membership`28865-filter-by-authorized-projects-in-v4	Toon Claes	2017-03-03	6	-14/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The query parameter `membership` should be more self-explaining.
\| * \| \| \|	Add filter param for authorized projects for current_user for V4	Oswaldo Ferreira	2017-03-03	5	-22/+57
\| \| \| \| \|
* \| \| \| \|	Merge branch 'revert_disallow_system_notes_for_closed_issuables' into 'master'	Sean McGivern	2017-03-03	2	-40/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Disallow system notes for closed issuables" Closes #28207 See merge request !9673
\| * \| \| \| \|	Revert "Disallow system notes for closed issuables"revert_disallow_system_notes_for_closed_issuables	Felipe Artur	2017-03-02	2	-40/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0771774480ce1f46b27b629d3721917d6c1f1267.
* \| \| \| \| \|	Merge branch '19497-hide-relevant-info-when-project-issues-are-disabled' ↵	Sean McGivern	2017-03-03	5	-25/+106
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Hide issue info when project issues are disabled Closes #19497 See merge request !9083
\| * \| \| \| \| \|	Hide issue info when project issues are disabled	George Andrinopoulos	2017-03-02	5	-25/+106
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '3440-remove-hsts-header-from-rails-app' into 'master' 13251-docs-on-search	Marin Jankovski	2017-03-03	4	-4/+31
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop setting Strict-Transport-Securty header from within the app See merge request !9341
\| * \| \| \| \| \|	Stop setting Strict-Transport-Securty header from within the app	Paweł Chojnacki	2017-03-03	4	-4/+31
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ee-comp-mr-2' into 'master'	Sean McGivern	2017-03-03	1	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve EE compatibility MR docs [ci skip] See merge request !9681
\| * \| \| \| \| \|	Improve EE compatibility MR docs [ci skip] ee-comp-mr-2	Adam Niedzielski	2017-03-03	1	-1/+4
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE MR should be updated before CE MR is merged. Suggest using "git rerere".
* \| \| \| \| \|	Merge branch 'rs-dev-seed-time' into 'master'	Sean McGivern	2017-03-03	2	-12/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the `Gitlab::Seeder` monkey patch to disable mail delivery Closes #27609 See merge request !9678
\| * \| \| \| \| \|	Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-time	Robert Speicher	2017-03-02	2	-12/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'tooltip-hide-on-scroll' into 'master'	Filipa Lacerda	2017-03-03	2	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hides the tooltip on scroll See merge request !9653
\| * \| \| \| \| \| \|	Hides the tooltip on scrolltooltip-hide-on-scroll	Phil Hughes	2017-03-02	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is especially obvious on mobile. The tooltip opens on tap but there is no way to hide it, so this hides the tooltip after scrolling.
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/fix-build-retry-tags-assignment' into 'master'	Kamil Trzciński	2017-03-03	3	-25/+53
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix runner tags assignment when retrying a job Closes #28846 See merge request !9612
\| * \| \| \| \| \| \|	Fix Rubocop offense in build retry servicefix/gb/fix-build-retry-tags-assignment	Grzegorz Bizon	2017-03-02	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move unused consts from retry build service to specs	Grzegorz Bizon	2017-03-02	2	-23/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve build retry service tests for cloning data	Grzegorz Bizon	2017-03-01	2	-2/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix runner tags assignment when retrying a job	Grzegorz Bizon	2017-03-01	3	-23/+41
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '27532_api_changes' into 'master'	Sean McGivern	2017-03-03	8	-17/+317
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use iids as filter parameter Closes #27532 See merge request !9096
\| * \| \| \| \| \| \| \|	Use iids as filter parameter	Jarka Kadlecova	2017-03-02	8	-17/+317
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28935-make-logo-smaller' into 'master'	Alfredo Sumaran	2017-03-03	3	-4/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease tanuki logo size Closes #28935 See merge request !9676
\| * \| \| \| \| \| \| \| \|	Decrease tanuki logo size	Annabel Dunstone Gray	2017-03-02	3	-4/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '28010-mr-merge-button-default-to-danger' into 'master'	Alfredo Sumaran	2017-03-03	9	-35/+122
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default to dangerous MR merge button Closes #28010 See merge request !9245
\| * \| \| \| \| \| \| \| \|	Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-danger	Eric Eastwood	2017-03-02	9	-35/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9245
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove_group_policy_add_rules' into 'master'	Douwe Maan	2017-03-02	1	-6/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove now unnecessary `additional_rules!` method from GroupPolicy See merge request !9595
\| * \| \| \| \| \| \| \| \| \|	Remove now unnecessary `additional_rules!` method from GroupPolicy	Drew Blessing	2017-02-28	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The intention was for this to be used to override group policy in EE. This led to all sort of strange problems in practice - for example, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1025 needed to override `owner` permissions, but `additional_rules!` passed `master` only. The better solution is to use an EE module to override the policy. Removing this now defunct method.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master'	Robert Speicher	2017-03-02	8	-46/+52
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix creating a file in an empty repo using the API Closes #28626 See merge request !9632
\| * \| \| \| \| \| \| \| \| \| \|	Delete hooks from project with empty repositorydm-fix-api-create-file-on-empty-repo	Douwe Maan	2017-03-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't require start branch to exist if we're just creating a new branch	Douwe Maan	2017-03-02	1	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix spec	Douwe Maan	2017-03-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix variable name and change copy	Douwe Maan	2017-03-01	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix creating a file in an empty repo using the API	Douwe Maan	2017-03-01	7	-44/+50
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '27978-improve-task-list-ux' into 'master'	Clement Ho	2017-03-02	3	-4/+78
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only add a newline in Markdown Editor if the current line is not empty Closes #27978 See merge request !9455
\| * \| \| \| \| \| \| \| \| \| \| \|	Only add a newline in Markdown Editor if the current line is not empty	Jan Christophersen	2017-03-02	3	-4/+78
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-svg-loader' into 'master'	Fatih Acet	2017-03-02	37	-306/+156
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Tech debt: No need to pass svgs as props into Vue with Webpack Closes #27692 and #27840 See merge request !9522