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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Transition from installable to not_installablefrom-installable-to-not-installable	Enrique Alcantara	2019-06-24	1	-7/+9
\| \| \| \| \|	Contemplate the scenario where a K8 managed application becomes not_installable after being installable.
*	Merge branch 'sh-optimize-todos-controller' into 'master'	Douglas Barbosa Alexandre	2019-06-24	1	-0/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in Dashboard::TodosController Closes #43042 See merge request gitlab-org/gitlab-ce!29954
\| *	Eliminate N+1 queries in Dashboard::TodosController	Stan Hu	2019-06-24	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This appears to bring down the number of SQL queries on GitLab.com for my Todos page from 672 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43042
* \|	Merge branch '63656-runner-tags-search-dropdown-is-empty' into 'master'	Jan Provaznik	2019-06-24	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Runner tags search dropdown is empty" Closes #63656 See merge request gitlab-org/gitlab-ce!29985
\| * \|	Return all runner tags when search is empty63656-runner-tags-search-dropdown-is-empty	Dmitriy Zaporozhets	2019-06-24	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Revert "Merge branch..."	Kamil Trzciński	2019-06-24	3	-10/+10
\| \|/ \|/\| \| \| \| \|	This reverts merge request !29832
* \|	Merge branch 'jivanvl-add-column-chart-monitoring-dashboard' into 'master'	Mike Greiling	2019-06-24	1	-0/+58
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add column chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!29293
\| * \|	Add column chart component to the monitoring bundlejivanvl-add-column-chart-monitoring-dashboard	Jose Vargas	2019-06-21	1	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge request just adds the column chart component without integrating it to the dashboard
* \| \|	Merge branch 'divergence-graph-fe-rendering' into 'master'	Filipa Lacerda	2019-06-24	3	-0/+193
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render branch divergence graph with Vue See merge request gitlab-org/gitlab-ce!29743
\| * \| \|	Render branch divergance graph with Vue	Phil Hughes	2019-06-24	3	-0/+193
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'search-blob-basenames' into 'master'	Kamil Trzciński	2019-06-24	2	-10/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build correct basenames for title search results See merge request gitlab-org/gitlab-ce!29898
\| * \| \|	Build correct basenames for title search resultssearch-blob-basenames	Markus Koller	2019-06-20	2	-10/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.
* \| \| \|	Add name & search parameters to project environments API	Lee Tickett	2019-06-24	1	-0/+41
\| \| \| \|
* \| \| \|	Merge branch '52366-improved-group-lists-ui' into 'master'	Phil Hughes	2019-06-24	2	-12/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improved group lists UI" Closes #52366 See merge request gitlab-org/gitlab-ce!26542
\| * \| \| \|	Improve group list UI	Dennis Tang	2019-06-24	2	-12/+7
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates the groups list UI to match the style of the project list: - New layout - Improve loading state when loading group children - Larger, responsive text - Icon and text colors changed to secondary - Smaller button sizes - Content list description colors were standardized to body text
* \| \| \|	Merge branch 'ci-pipeline-build-seed-spec-refactor' into 'master'	Kamil Trzciński	2019-06-24	1	-47/+43
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	RSpec::Parameterized syntax for CI pipeline build seed specs See merge request gitlab-org/gitlab-ce!29947
\| * \| \|	RSpec::Parameterized syntax for CI pipeline build seed specs	drew cimino	2019-06-21	1	-47/+43
\| \| \| \|
* \| \| \|	Merge branch 'fix-labels-in-hooks' into 'master'	Ash McKenzie	2019-06-24	3	-8/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label serialisation in issue and note hooks Closes #63473 See merge request gitlab-org/gitlab-ce!29850
\| * \| \| \|	Added labels_hook_attrs methodfix-labels-in-hooks	Jan Provaznik	2019-06-24	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on review comment fetching labels hook_attrs is now wrapped in an issue's model method.
\| * \| \| \|	Fix label serialisation in issue and note hooks	Sean McGivern	2019-06-20	2	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were not calling hook_attrs on the labels correctly. Specs were passing because the issues under test did not have any labels!
* \| \| \| \|	Show create merge request button on confidential issues	Phil Hughes	2019-06-24	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* \| \| \| \|	Merge branch 'fix-pipeline-schedule-edge-case' into 'master'	Lin Jen-Shin	2019-06-24	1	-32/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FIX: Scheduled pipelines scheduled to run at the same time as pipeline_schedule_worker gets pushed to the next run Closes #63469 See merge request gitlab-org/gitlab-ce!29848
\| * \| \| \| \|	Fix pipeline schedule edge casefix-pipeline-schedule-edge-case	Shinya Maeda	2019-06-24	1	-32/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If pipeline schedule is to run at the exact same time with when cron worker runs, the pipeline schedule will not be executed at the ideal timing. We fix this bug by comparing the exact matching of ideal and cron worker's next run at.
* \| \| \| \| \|	Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'	Douwe Maan	2019-06-24	6	-142/+425
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
\| * \| \| \| \| \|	Avoid touching the MR status if MR is not opened	Oswaldo Ferreira	2019-06-21	1	-0/+24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Only force recheck when merge-ref is outdated	Oswaldo Ferreira	2019-06-20	1	-1/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When recheck flag is true, we make sure the merge-ref is indeed outdated. If it is, we update it along the merge status.
\| * \| \| \| \| \|	Automatically update MR merge-ref along merge status	Oswaldo Ferreira	2019-06-20	6	-142/+358
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* \| \| \| \| \| \|	Fix notes email with group-level notification email	Sean McGivern	2019-06-24	4	-25/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A Noteable doesn't have a group directly, unless it's an epic - we need to look for the project's group to find the right email address.
* \| \| \| \| \| \|	Merge branch 'remove_create_deployment_from_build_success_worker' into 'master'	Douwe Maan	2019-06-24	1	-44/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated call in BuildSuccessWorker Closes #63622 See merge request gitlab-org/gitlab-ce!29958
\| * \| \| \| \| \| \|	Remove deprecated call in BuildSuccessWorkerremove_create_deployment_from_build_success_worker	Thong Kuah	2019-06-24	1	-44/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now create_deployment on Ci::Build create. No need to call create_deployment again
* \| \| \| \| \| \| \|	Merge branch ↵	Thong Kuah	2019-06-24	2	-1/+95
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-deleted-And-add-MR-option' into 'master' Skip TeamCity trigger on branch delete and support MR triggers Closes #13871 and #17690 See merge request gitlab-org/gitlab-ce!29836
\| * \| \| \| \| \| \|	Extract common validations from ci services	Raphael Tweitmann	2019-06-21	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DroneCI and TeamCity shared the same validations methods on the data received. These validations were extracted into a concern
\| * \| \| \| \| \| \|	Skip TeamCity on branch delete and add MR trigger	Nikolay Novikov	2019-06-21	2	-0/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a take over from a community contribution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20990 Skip TeamCity push event when related to branch delete Support merge request events for TeamCity service. Add checkbox for merge request triggers in the TeamCity configuration page.
* \| \| \| \| \| \| \|	Merge branch 'update-pagination-texts' into 'master'	Kushal Pandya	2019-06-24	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update pagination prev and next texts See merge request gitlab-org/gitlab-ce!29911
\| * \| \| \| \| \| \| \|	Update pagination prev and next textsupdate-pagination-texts	Paul Gascou-Vaillancourt	2019-06-20	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '60617-enable-project-cluster-jit' into 'master'	Thong Kuah	2019-06-24	7	-50/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable JIT Kubernetes resource creation for project level clusters See merge request gitlab-org/gitlab-ce!29515
\| * \| \| \| \| \| \| \| \|	Enable project-level JIT resource creation60617-enable-project-cluster-jit	Tiger	2019-06-18	7	-50/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously this behaviour was only available to group and instance-level clusters, as some project clusters relied on Kubernetes credentials being passed through to the runner instead of having their resources managed by GitLab (which is not available when using JIT). These clusters have been migrated to unmanaged, so resources can be created on demand for the remaining managed clusters.
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-strong-memoize-appearances' into 'master'	Thong Kuah	2019-06-24	1	-0/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Memoize non-existent custom appearances See merge request gitlab-org/gitlab-ce!29957
\| * \| \| \| \| \| \| \| \| \|	Memoize non-existent custom appearancessh-strong-memoize-appearances	Stan Hu	2019-06-23	1	-0/+16
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves about 5 SQL calls per page if no custom appearance is specified.
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-enable-ref-name-caching-discussions' into 'master'	Ash McKenzie	2019-06-24	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Gitaly ref name caching for discussions.json See merge request gitlab-org/gitlab-ce!29951
\| * \| \| \| \| \| \| \| \|	Enable Gitaly ref name caching for discussions.jsonsh-enable-ref-name-caching-discussions	Stan Hu	2019-06-22	1	-0/+2
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This eliminates many potential duplicate FindCommit RPCs for the same ref, which often occurs in the RelativeLinkFilter#current_commit call. On the GitLab 12.0 release post, for example, this would save close to 400 RPC calls.
* \| \| \| \| \| \| \| \|	Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' ↵	Mike Greiling	2019-06-21	1	-0/+26
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Display in admin area if emails are verified or not" Closes #49814 See merge request gitlab-org/gitlab-ce!29669
\| * \| \| \| \| \| \| \| \|	Add verification badge to users emails49814-display-in-admin-area-if-emails-are-verified-or-not	Brandon Labuschagne	2019-06-20	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is being applied to the admin users view, when an admin selects a user profile tp view. It gives admins the ability to see an email verification status without the need of impersonating a user.
* \| \| \| \| \| \| \| \| \|	Select deployments that only has the app label	Thong Kuah	2019-06-21	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As Auto DevOps deployments both label and annotations, that will be included in the deploy board so need to warn at all.
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2019-06-21	1	-21/+47
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key' into 'master' Include the GitLab version in the cache key for Gitlab::JsonCache See merge request gitlab-org/gitlab-ce!29938
\| * \| \| \| \| \| \| \| \| \|	Include the GitLab version in the cache key for Gitlab::JsonCache	Douglas Barbosa Alexandre	2019-06-21	1	-21/+47
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'mg-upgrade-prettier' into 'master'	Clement Ho	2019-06-21	4	-23/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade prettier to latest (v1.18.2) See merge request gitlab-org/gitlab-ce!29943
\| * \| \| \| \| \| \| \| \| \|	Upgrade prettier to latest (v1.18.2)	Mike Greiling	2019-06-21	4	-23/+7
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrades prettier to the latest version, and auto-corrects files with yarn prettier-all-save The diffs all seem to stem from formatting changes in brackets within template literals. Nothing major. Relevant changelogs here: https://prettier.io/blog/2019/04/12/1.17.0.html https://prettier.io/blog/2019/06/06/1.18.0.html
* \| \| \| \| \| \| \| \| \|	Add confirmation for registry image deletion	Paul Gascou-Vaillancourt	2019-06-21	4	-3/+77
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a modal to let the user confirm their action before proceeding to registry/image deletion
* \| \| \| \| \| \| \| \|	Merge branch 'sh-clean-up-bitbucket-import-errors' into 'master'	Douglas Barbosa Alexandre	2019-06-21	1	-6/+21
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid storing backtraces from Bitbucket Cloud imports in the database See merge request gitlab-org/gitlab-ce!29862