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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '5779_rename_code_quality_job_and_artifact' into 'master'	Achilleas Pipinellis	2018-05-24	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Rename code quality job and artifact. See merge request gitlab-org/gitlab-ce!19049
\| *	Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779	Olivier Gonzalez	2018-05-23	1	-1/+1
\| \|
* \|	Fix backup creation and restore for specific Rake tasks	Stan Hu	2018-05-24	3	-6/+17
\| \|
* \|	Merge branch 'ce-jej/saml-failure-messages' into 'master'	Grzegorz Bizon	2018-05-24	2	-0/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[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	2	-0/+15
\| \| \|
* \| \|	Merge branch 'fl-loading-icon' into 'master'	Phil Hughes	2018-05-24	1	-1/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+10
\| \| \| \|
* \| \| \|	Merge branch 'mr-conflict-notification' into 'master'	Douwe Maan	2018-05-24	10	-60/+238
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042
\| * \| \| \|	Add spec	Mark Chao	2018-05-24	1	-22/+34
\| \| \| \| \|
\| * \| \| \|	Plural reason(s)	Mark Chao	2018-05-18	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Create TODO when MR became unmergeable	lulalala	2018-05-17	2	-34/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-0/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display MR unmergeable reasons
\| * \| \| \|	Add MergeRequest#merge_participants	lulalala	2018-05-17	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For notifying via todo or email.
\| * \| \| \|	Add cannot_be_merged_recheck merge_status	lulalala	2018-05-17	5	-4/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \|	Merge branch 'jprovazn-fix-resolvable' into 'master'	Douwe Maan	2018-05-24	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+24
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-05-23	4	-102/+209
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| * \| \| \| \| \|	Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes	Rémy Coutable	2018-05-23	1	-50/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Use the new CacheableAttributes concern in the ApplicationSetting and ↵	Rémy Coutable	2018-05-23	2	-52/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Appearance models Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Introduce a new CacheableAttributes concern	Rémy Coutable	2018-05-23	1	-0/+153
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'fix/devops-remove-beta' into 'master'	Tim Zallmann	2018-05-23	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'	Rémy Coutable	2018-05-23	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Prometheus integration fails on k8s 1.10" Closes #46259 See merge request gitlab-org/gitlab-ce!19082
\| * \| \| \| \| \| \|	Update Prometheus URL spec for 1.10 format	Joshua Lambert	2018-05-22	1	-1/+1
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Render 404 when prometheus adapter is disabled in Prometheus metrics controller	Tiago Botelho	2018-05-23	1	-25/+48
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue-25256' into 'master'	Douwe Maan	2018-05-23	3	-2/+55
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	skip email trim when email is creating new issue See merge request gitlab-org/gitlab-ce!18865
\| * \| \| \| \| \|	skip email trim when email is creating new issue	Cameron Crockett	2018-05-22	3	-2/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates from MR discussion 1. Added test for ReplyParser 2. Changed param to trim_reply with default set as true Removed keyword param in favor of normal options param updates for MR discussion Resolutions for code review comments more code review fixes
* \| \| \| \| \| \|	Resolve "Deprecate Gemnasium project service"	Olivier Gonzalez	2018-05-23	2	-24/+29
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "Web IDE doesn't work for branches with slashes"	Tim Zallmann	2018-05-23	1	-2/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ide-commit-state-bug' into 'master'	Filipa Lacerda	2018-05-23	1	-0/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed web IDE review & commit editors getting into incorrect state Closes #46392 See merge request gitlab-org/gitlab-ce!19038
\| * \| \| \| \| \| \|	fixed spec	Phil Hughes	2018-05-23	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	added specide-commit-state-bug	Phil Hughes	2018-05-22	1	-0/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ide-jobs-list' into 'master'	Filipa Lacerda	2018-05-23	5	-2/+527
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipelines store actions & states in web IDE Closes #44604 See merge request gitlab-org/gitlab-ce!18912
\| * \| \| \| \| \| \| \|	group jobs into stageside-jobs-list	Phil Hughes	2018-05-22	4	-13/+128
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added getter for checking is their is a pipeline	Phil Hughes	2018-05-22	2	-1/+47
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show CI jobs in web IDE	Phil Hughes	2018-05-22	4	-2/+366
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44604
* \| \| \| \| \| \| \|	Merge branch 'ide-file-finder-improve-order' into 'master'	Filipa Lacerda	2018-05-23	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed IDE file finder ordering See merge request gitlab-org/gitlab-ce!18948
\| * \| \| \| \| \| \|	changed what bit of code stops the callbackide-file-finder-improve-order	Phil Hughes	2018-05-22	1	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '44895-explicit-merge-conflict' into 'master'	Tim Zallmann	2018-05-22	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Make explicit that merge conflict feature commits to source branch" Closes #44895 See merge request gitlab-org/gitlab-ce!18921
\| * \| \| \| \| \| \| \|	Make it explicit that merge conflict feature commits to source branch	Annabel Dunstone Gray	2018-05-21	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dm-xcode-project-directory' into 'master'	Robert Speicher	2018-05-22	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Xcode project detection by looking for dirs instead of files See merge request gitlab-org/gitlab-ce!19035
\| * \| \| \| \| \| \| \| \|	Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directory	Douwe Maan	2018-05-22	1	-7/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-05-22	2	-33/+82
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474
\| * \| \| \| \| \| \| \| \| \|	Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmed	Rémy Coutable	2018-05-22	2	-33/+82
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-6114-move-some-features-projects-specs' into 'master'	Rémy Coutable	2018-05-22	1	-0/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Resolve "Extract EE specific files/lines for some projects features specs" See merge request gitlab-org/gitlab-ce!19084
\| * \| \| \| \| \| \| \| \| \|	Unify spec/features/projects/blobs/blob_show_spec.rb	Lin Jen-Shin	2018-05-22	1	-0/+18
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'ab-42194-keyset-pagination' into 'master'	Yorick Peterse	2018-05-22	1	-8/+204
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Keyset pagination support Closes #45756 See merge request gitlab-org/gitlab-ce!18584
\| * \| \| \| \| \| \| \| \| \|	Add keyset pagination for API calls.	Andreas Brandl	2018-05-21	1	-8/+204
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #45756.