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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rs-projects-destroy-service-parity' into 'master'	Rémy Coutable	2018-05-25	1	-3/+16
\|\ \| \| \| \| \| \| \| \|	Bring CE-EE parity to app/services/projects/destroy_service.rb See merge request gitlab-org/gitlab-ce!19111
\| *	Bring CE-EE parity to app/services/projects/destroy_service.rbrs-projects-destroy-service-parity	Robert Speicher	2018-05-23	1	-3/+16
\| \|
* \|	Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'	Rémy Coutable	2018-05-25	3	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125
\| * \|	Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repo	Rémy Coutable	2018-05-24	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master'	Filipa Lacerda	2018-05-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Typo on the empty Pipelines page" Closes #46768 See merge request gitlab-org/gitlab-ce!19140
\| * \| \|	Fix typo in Pipelines empty state view	Mark Fletcher	2018-05-25	1	-1/+1
\| \|/ /
* \| \|	Resolve "Show CI pipeline status in Web IDE"	André Luís	2018-05-25	9	-29/+150
\| \| \|
* \| \|	Merge branch 'dz-refactor-cluster-apps-schedule' into 'master'	Douwe Maan	2018-05-24	2	-17/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor code around scheduling cluster installations See merge request gitlab-org/gitlab-ce!19108
\| * \| \|	Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-schedule	Dmitriy Zaporozhets	2018-05-24	2	-17/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Updated branches and tag icons in commit details	Constance Okoghenun	2018-05-24	2	-3/+4
\| \| \| \|
* \| \| \|	Merge branch 'ce-6127-move-merge-requests-services' into 'master'	Rémy Coutable	2018-05-24	1	-2/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Extract EE specific files/lines for some merge requests files See merge request gitlab-org/gitlab-ce!19107
\| * \| \| \|	Extract a do_execute method to be overriddence-6127-move-merge-requests-services	Lin Jen-Shin	2018-05-24	1	-2/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue_38418' into 'master'	Rémy Coutable	2018-05-24	3	-9/+37
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix sidebar issue count Closes #38418 See merge request gitlab-org/gitlab-ce!19022
\| * \| \| \| \|	Fix sidebar issue countissue_38418	Felipe Artur	2018-05-24	3	-9/+37
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-jej/saml-failure-messages' into 'master'	Grzegorz Bizon	2018-05-24	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fl-loading-icon' into 'master'	Phil Hughes	2018-05-24	2	-3/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+12
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mr-conflict-notification' into 'master'	Douwe Maan	2018-05-24	10	-24/+122
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042
\| * \| \| \| \| \| \|	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	3	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Create TODO when MR became unmergeable	lulalala	2018-05-17	3	-19/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-0/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display MR unmergeable reasons
\| * \| \| \| \| \| \|	Add MergeRequest#merge_participants	lulalala	2018-05-17	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For notifying via todo or email.
\| * \| \| \| \| \| \|	Add cannot_be_merged_recheck merge_status	lulalala	2018-05-17	2	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jprovazn-fix-resolvable' into 'master'	Douwe Maan	2018-05-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '39710-search-placeholder-cut-off' into 'master'	Annabel Gray	2018-05-23	6	-29/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-29/+11
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'ldap-u2f-fix' into 'master'	Mike Greiling	2018-05-23	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #46661
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-05-23	5	-47/+61
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| * \| \| \| \| \| \| \| \| \|	Use ApplicationSetting.current_without_cache instead of ↵	Rémy Coutable	2018-05-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-46/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Appearance models Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Introduce a new CacheableAttributes concern	Rémy Coutable	2018-05-23	1	-0/+54
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/devops-remove-beta' into 'master'	Tim Zallmann	2018-05-23	4	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-4/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Render 404 when prometheus adapter is disabled in Prometheus metrics controller	Tiago Botelho	2018-05-23	1	-1/+1
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \| \|	CE: Use render_if_exists to hide EE specific codes	Lin Jen-Shin	2018-05-23	2	-0/+14
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-boards-issues-create-service-parity' into 'master'	Rémy Coutable	2018-05-23	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring CE-EE parity to app/services/boards/issues/create_service.rb See merge request gitlab-org/gitlab-ce!19093
\| * \| \| \| \| \| \| \| \|	Bring CE-EE parity to app/services/boards/issues/create_service.rbrs-boards-issues-create-service-parity	Robert Speicher	2018-05-22	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Resolve "Deprecate Gemnasium project service"	Olivier Gonzalez	2018-05-23	2	-1/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Resolve "Web IDE doesn't work for branches with slashes"	Tim Zallmann	2018-05-23	6	-19/+32
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ide-commit-state-bug' into 'master'	Filipa Lacerda	2018-05-23	1	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed web IDE review & commit editors getting into incorrect state Closes #46392 See merge request gitlab-org/gitlab-ce!19038
\| * \| \| \| \| \| \| \| \| \|	Fixed web IDE review & commit editors getting into incorrect state	Phil Hughes	2018-05-18	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #46392