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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Disable the background Prometheus sampler in testssh-disable-background-metrics-in-tests	Stan Hu	2018-05-24	1	-1/+1
\| \| \| \| \|	This sampler can interfere with tests and cause transient build failures, such as https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/70241683.
*	Merge branch 'ce-jej/saml-failure-messages' into 'master'	Grzegorz Bizon	2018-05-24	3	-2/+17
\|\ \| \| \| \| \| \| \| \|	[CE] Backport helpers from GroupSAML failure messages See merge request gitlab-org/gitlab-ce!19064
\| *	Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messages	James Edwards-Jones	2018-05-21	3	-2/+17
\| \|
* \|	Merge branch 'fl-loading-icon' into 'master'	Phil Hughes	2018-05-24	3	-4/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Show loading icon only when making the request See merge request gitlab-org/gitlab-ce!19116
\| * \|	Show loading icon only when making the requestfl-loading-icon	Filipa Lacerda	2018-05-23	3	-4/+22
\| \| \|
* \| \|	Merge branch 'mr-conflict-notification' into 'master'	Douwe Maan	2018-05-24	24	-85/+373
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042
\| * \| \|	Add spec	Mark Chao	2018-05-24	1	-22/+34
\| \| \| \|
\| * \| \|	Avoid race condition of re-triggering mark_as_unchecked	Mark Chao	2018-05-18	1	-2/+2
\| \| \| \|
\| * \| \|	Plural reason(s)	Mark Chao	2018-05-18	4	-5/+6
\| \| \| \|
\| * \| \|	Create TODO when MR became unmergeable	lulalala	2018-05-17	6	-53/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Old behavior of creating TODO when “Merge When Pipeline Succeeds” service fails, is generalized to: Create a TODO whenever MR became unmergeable (and similar to notification, MR author and merge_user are both applicable)
\| * \| \|	Notify with email when merge request became unmergeable	lulalala	2018-05-17	12	-0/+191
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display MR unmergeable reasons
\| * \| \|	Add MergeRequest#merge_participants	lulalala	2018-05-17	2	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \|	For notifying via todo or email.
\| * \| \|	Add cannot_be_merged_recheck merge_status	lulalala	2018-05-17	7	-9/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First, transitions between can_be_merged & cannot_be_merged are removed, as they are currently blocked in `check_if_can_be_merged`. `can_be_merge` always returns to `unchecked` first, before it can transition to `cannot_be_merged` (and vice versa). We want to avoid repeated notification triggered by repeated transition between `cannot_be_merged` & `unchecked`. So we added `cannot_be_merged_recheck` state, similar to `unchecked`, but as a mean to remember it’s from cannot_be_merged. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407 Since `unchecked` and `cannot_be_merged_recheck` both mean “we are in the middle of checking if it is mergeable”, quite often we need to see if merge_status is in either one of them, so `check_state?` is added to achieve this.
\| * \| \|	Update doc	lulalala	2018-05-17	1	-0/+1
\| \| \| \|
\| * \| \|	Update doc redirect link	lulalala	2018-05-17	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'jprovazn-fix-resolvable' into 'master'	Douwe Maan	2018-05-24	3	-1/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check if note's noteable is not nil when checking resolvability Closes #46573 See merge request gitlab-org/gitlab-ce!19081
\| * \| \| \|	Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvable	Jan Provaznik	2018-05-23	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This can occur when a note is added to a commit and then this commit is deleted.
* \| \| \| \|	Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'	Mike Greiling	2018-05-24	3	-1/+30
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Escape key to close MR check out branch modal" Closes #45850 See merge request gitlab-org/gitlab-ce!19050
\| * \| \| \| \|	Closes MR check out branch modal with escape	Jacopo	2018-05-22	3	-1/+30
\| \| \| \| \| \|
* \| \| \| \| \|	Update CHANGELOG.md for 10.8.1	Mayra Cabrera	2018-05-23	9	-40/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch '39710-search-placeholder-cut-off' into 'master'	Annabel Gray	2018-05-23	7	-29/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Runners search input placeholder is cut off" Closes #39710 See merge request gitlab-org/gitlab-ce!19015
\| * \| \| \| \| \|	Fixes: Runners search input placeholder is cut off	Jacopo	2018-05-23	7	-29/+16
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'ldap-u2f-fix' into 'master'	Mike Greiling	2018-05-23	2	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed U2F authentication when used with LDAP Closes #46661 See merge request gitlab-org/gitlab-ce!19115
\| * \| \| \| \| \|	Fixed U2F authentication when used with LDAP	Phil Hughes	2018-05-23	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #46661
* \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-05-23	15	-181/+295
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master' Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`" Closes #45175 See merge request gitlab-org/gitlab-ce!18754
\| * \| \| \| \| \| \|	Don't expire the current ApplicationSetting in config/initializers/1_settings.rb	Rémy Coutable	2018-05-23	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes	Rémy Coutable	2018-05-23	2	-76/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Use ApplicationSetting.current_without_cache instead of ↵	Rémy Coutable	2018-05-23	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ApplicationSetting.current where applicable Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Use the new CacheableAttributes concern in the ApplicationSetting and ↵	Rémy Coutable	2018-05-23	5	-98/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Appearance models Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Introduce a new CacheableAttributes concern	Rémy Coutable	2018-05-23	3	-0/+211
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master'	Achilleas Pipinellis	2018-05-23	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update keyboard shortcut conventions See merge request gitlab-org/gitlab-ce!19014
\| * \| \| \| \| \| \| \|	Update keyboard shortcut conventions	Andreas Kämmerle	2018-05-23	1	-3/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix/devops-remove-beta' into 'master'	Tim Zallmann	2018-05-23	8	-9/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed "(Beta)" from "Auto DevOps" messages See merge request gitlab-org/gitlab-ce!18759
\| * \| \| \| \| \| \| \|	removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-beta	Paul Slaughter	2018-05-21	8	-9/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '46505-update-autodevops-docs' into 'master'	Achilleas Pipinellis	2018-05-23	1	-0/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation of variables usage for disabling/enabling jobs in Auto DevOps Closes #46505 See merge request gitlab-org/gitlab-ce!19076
\| * \| \| \| \| \| \| \| \|	Add documentation of variables usage for disabling/enabling jobs in Auto DevOps	Tomasz Maczukin	2018-05-23	1	-0/+24
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'	Rémy Coutable	2018-05-23	2	-1/+17
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Prometheus integration fails on k8s 1.10" Closes #46259 See merge request gitlab-org/gitlab-ce!19082
\| * \| \| \| \| \| \| \|	Fix rubocop46259-prometheus-integration-fails-on-kube-1-10	Tiago Botelho	2018-05-23	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update Prometheus URL spec for 1.10 format	Joshua Lambert	2018-05-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Monkey patches Kubeclient::Client#proxy_url in order to make it compliant ↵	Tiago Botelho	2018-05-22	1	-0/+15
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with version 1.10 of kubernetes API
* \| \| \| \| \| \| \|	Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master'	Douwe Maan	2018-05-23	2	-0/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrading from EE to CE fails on project_mirror_data migrations Closes #46630 See merge request gitlab-org/gitlab-ce!19109
\| * \| \| \| \| \| \| \|	Rollback changes made to CreateProjectMirrorData46630-add-missing-columns-to-project-mirror-data	Tiago Botelho	2018-05-23	1	-11/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Renames AddMissingColumnsToProjectMirrorData to ↵	Tiago Botelho	2018-05-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EnsureMissingColumnsToProjectMirrorData
\| * \| \| \| \| \| \| \|	Adds changelog	Tiago Botelho	2018-05-23	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Adds migration to ensure the new project_mirror_data columns are indeed ↵	Tiago Botelho	2018-05-23	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added to the table
\| * \| \| \| \| \| \| \|	Edits create_project_mirror_data to add the new columns when table already ↵	Tiago Botelho	2018-05-23	1	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	exists
* \| \| \| \| \| \| \| \|	Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master'	Rémy Coutable	2018-05-23	3	-26/+54
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render 404 when prometheus adapter is disabled in Prometheus metrics controller Closes #46413 See merge request gitlab-org/gitlab-ce!19110
\| * \| \| \| \| \| \| \|	Render 404 when prometheus adapter is disabled in Prometheus metrics controller	Tiago Botelho	2018-05-23	3	-26/+54
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ce_backport_issue_5128' into 'master'	Rémy Coutable	2018-05-23	2	-6/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport - Allow viewing only one board when multiple issue boards is not enabled See merge request gitlab-org/gitlab-ce!19068
\| * \| \| \| \| \| \| \|	CE backport - Allow viewing only one board when multiple issue boards is not ↵ce_backport_issue_5128	Felipe Artur	2018-05-22	2	-6/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enabled