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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'project-cluster-spec-improvements' into 'master'	Jan Provaznik	2019-07-02	2	-44/+19
\|\ \| \| \| \| \| \| \| \|	Tidy spec for API::ProjectClusters See merge request gitlab-org/gitlab-ce!30154
\| *	Tidy spec for API::ProjectClustersproject-cluster-spec-improvements	Dylan Griffith	2019-07-02	2	-44/+19
\| \|
* \|	Merge branch '63984-rename-in-folder' into 'master'	Kushal Pandya	2019-07-02	1	-0/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hid re-named entries in subfolders Closes #63984 See merge request gitlab-org/gitlab-ce!30242
\| * \|	Hid re-named entries in subfolders63984-rename-in-folder	Denys Mishunov	2019-07-02	1	-0/+13
\| \| \|
* \| \|	Merge branch '82-add-new-onboarding-to-flipper-a-b-testing' into 'master'	Nick Thomas	2019-07-01	1	-0/+38
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Add new onboarding to flipper A/B testing See merge request gitlab-org/gitlab-ce!30125
\| * \|	Add new OnboardingExperimentHelper modules	Ash McKenzie	2019-06-28	1	-0/+38
\| \|/ \| \| \| \| \| \| \| \| \| \|	OnboardingExperimentHelpers take care of determining if the current_user should or should not see the new onboarding feature.
* \|	Merge branch '9491-graphql-view-design-board-at-version-ce' into 'master'	Nick Thomas	2019-07-01	1	-0/+44
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for "Show design boards at previous versions in GraphQL" See merge request gitlab-org/gitlab-ce!30151
\| * \|	CE backport for changes in EE MR 142929491-graphql-view-design-board-at-version-ce	Luke Duncalfe	2019-06-28	1	-0/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14292 https://gitlab.com/gitlab-org/gitlab-ee/issues/9491
* \| \|	Merge branch '63590-pipeline-actions-cause-full-refresh' into 'master'	Phil Hughes	2019-07-01	1	-6/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Pipeline actions cause full refresh" Closes #63590 See merge request gitlab-org/gitlab-ce!30190
\| * \| \|	Fix pipelines table update after action63590-pipeline-actions-cause-full-refresh	shampton	2019-06-28	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The pipelines table was showing the loading icon after the user cancelled or retried a pipeline. This fixes that so the pipeline updates without removing the table from the DOM.
* \| \| \|	Allow JupyterHub to be uninstalled	João Cunha	2019-07-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- enabled uninstallation - give it a specific uninstall message - ajust specs
* \| \| \|	Merge branch 'divergence-graph-api-call' into 'master'	Filipa Lacerda	2019-07-01	1	-0/+32
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch branches divergence graph data through API call Closes #46139 See merge request gitlab-org/gitlab-ce!30068
\| * \| \| \|	Fetch branch diverging counts from API	Phil Hughes	2019-07-01	1	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46139
* \| \| \| \|	Merge branch 'test_schema_version_check_directly' into 'master'	Robert Speicher	2019-07-01	1	-7/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test schema_version_check directly Closes #63913 See merge request gitlab-org/gitlab-ce!30209
\| * \| \| \| \|	Test schema_version_check directlytest_schema_version_check_directly	Thong Kuah	2019-07-01	1	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Testing via db:migrate causes side-effects like setting ActiveRecord::Base.configurations and also it runs schema dump into db/schema.rb. Rather than keep up, we test schema_version_check directly
* \| \| \| \| \|	Merge branch 'sh-fix-issue-63910' into 'master'	Sean McGivern	2019-07-01	1	-0/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix attachments using the wrong URLs in e-mails Closes #63910 See merge request gitlab-org/gitlab-ce!30197
\| * \| \| \| \| \|	Fix attachments using the wrong URLs in e-mailssh-fix-issue-63910	Stan Hu	2019-06-28	1	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29889, only the project context were set for the Markdown renderer. For a note on an issuable, the group context was set to `nil` because `note.noteable.try(:group)` attempted to get the issuable's group, which doesn't exist. To make group notifications work, now both the project and group context are set. The context gets passed to `RelativeLinkFilter`, which previously assumed that it wasn't possible to have both a group and a project in the Markdown context. However, if a group were defined, it would take precedence, and the URL rendered for uploads would be `/group/-/uploads` instead of `/group/project/uploads/`. This led to 404s in e-mails. However, now that we have both project and group in the context, we render the Markdown giving priority to the project context if is set. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63910
* \| \| \| \| \| \|	Revert "Include subgroups in shared_projects"	Fabian Schneider	2019-07-01	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4bed2daef935bb4097988e0eff4830fc13a23c37.
* \| \| \| \| \| \|	Merge branch '63863-fix-groups-in-email-subject' into 'master'	Sean McGivern	2019-07-01	2	-20/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove group in notification email subject Closes #63863 See merge request gitlab-org/gitlab-ce!30214
\| * \| \| \| \| \| \|	Remove group in notification email subject	Heinrich Lee Yu	2019-07-01	2	-20/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts to previous behavior where we have the group only when we don't have a project
* \| \| \| \| \| \| \|	Merge branch '58583-confidential-mr-branch-backend' into 'master'	Rémy Coutable	2019-07-01	4	-99/+253
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support creating an MR/branch on a fork from an issue See merge request gitlab-org/gitlab-ce!29831
\| * \| \| \| \| \| \| \|	Check if user can `update_issue` on project	Patrick Bajao	2019-07-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If user can update an issue under the specified confidential issue project, should be able to find the project.
\| * \| \| \| \| \| \| \|	Fix issues when creating system notes58583-confidential-mr-branch-backend	Patrick Bajao	2019-06-29	3	-11/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When `confidential_issue_project_id` is set and the issue is under that project, create the a note about branch creation in that project. If not, do nothing. When creating `new_merge_request` system note, set the project where the MR will be referenced from so it'll be linked to when the MR is created in another project.
\| * \| \| \| \| \| \| \|	Support branch creation from confidential issue	Patrick Bajao	2019-06-29	3	-132/+158
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept a `confidential_issue_project_id` param which will be used for the system note target. This also includes some refactoring on the spec to use shared examples.
\| * \| \| \| \| \| \| \|	Support creating an MR on a fork from an issue	Patrick Bajao	2019-06-29	1	-82/+194
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-circuit-breaker-removal-part-deux' into 'master'	Bob Van Landuyt	2019-07-01	1	-20/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ignored circuit_breaker columns See merge request gitlab-org/gitlab-ce!30159
\| * \| \| \| \| \| \| \|	Remove ignored circuit_breaker columns	Zeger-Jan van de Weg	2019-06-28	1	-20/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The circuit breaker itself got removed a while ago, when that happened some parts got left behind. Using grep old stale settings and validations were found and are now removed.
* \| \| \| \| \| \| \| \|	Merge branch 'id-stale-branches' into 'master'	Grzegorz Bizon	2019-07-01	4	-42/+84
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add endpoint for fetching diverging commit counts See merge request gitlab-org/gitlab-ce!29802
\| * \| \| \| \| \| \| \| \|	Add endpoint for fetching diverging commit countsid-stale-branches	Igor Drozdov	2019-06-28	4	-42/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract diverging_commit_counts into a service class
* \| \| \| \| \| \| \| \| \|	Merge branch 'tc-rake-orphan-artifacts' into 'master'	Dmitriy Zaporozhets	2019-07-01	3	-0/+163
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rake task to clean orphan artifact files See merge request gitlab-org/gitlab-ce!29681
\| * \| \| \| \| \| \| \| \|	Add rake task to clean orphan artifact filestc-rake-orphan-artifacts	Toon Claes	2019-06-28	3	-0/+163
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the rake task rake gitlab:cleanup:orphan_job_artifact_files. This rake task cleans all orphan job artifact files it can find on disk. It performs a search on the complete folder of all artifacts on disk. Then it filters out all the job artifact ID for which it could not find a record with matching ID in the database. For these, the file is deleted from disk.
* \| \| \| \| \| \| \| \|	Merge branch '45120-fix-ide-editor-to-update-size-on-show-change' into 'master'	Phil Hughes	2019-07-01	1	-7/+56
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IDE editor to update dimensions on show change Closes #45120 See merge request gitlab-org/gitlab-ce!30135
\| * \| \| \| \| \| \| \| \|	Fix IDE editor to update dimensions on show change45120-fix-ide-editor-to-update-size-on-show-change	Paul Slaughter	2019-06-28	1	-7/+56
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'add-clusters-to-deployment' into 'master'	Lin Jen-Shin	2019-07-01	4	-22/+80
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clusters association to deployment See merge request gitlab-org/gitlab-ce!29960
\| * \| \| \| \| \| \| \| \|	Use #cluster for prometheus_adapteradd-clusters-to-deployment	Thong Kuah	2019-06-27	2	-0/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We still fallback to environment.deployment_platform until we can backfill
\| * \| \| \| \| \| \| \| \|	Drop fallback to deployment platform	Thong Kuah	2019-06-27	1	-18/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All deployments should have already their cluster_id filled in on creation. Legacy deployments will not be retried as:- * Ci::Build#retry calls `Ci::RetryBuildService` * Ci::Pipeline#retry calls `Ci::RetryPipelineService` which also calls `Ci::RetryBuildService` * `Ci::RetryBuildService` will clone a build to retry It is also impossibly to backfill Deployment#cluster_id from Project#deployment_platform correctly as clusters could have been deleted, added or altered in the intervening time.
\| * \| \| \| \| \| \| \| \|	Populate cluster_id when creating a deployment	Thong Kuah	2019-06-27	1	-4/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add cluster_id to deployments table as an FK	Thong Kuah	2019-06-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We nullify when cluster is deleted as we want to keep the deployment record around. Add cluster as an optional association We will have only cluster for deployments where the build deploys to a kubernetes cluster
* \| \| \| \| \| \| \| \| \|	Quarantine schema_version_check because tests after it failed	Lin Jen-Shin	2019-07-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'check-min-schema-migrate' into 'master'	Robert Speicher	2019-06-28	1	-0/+50
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we are on a supported version before migrating See merge request gitlab-org/gitlab-ce!29882
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 'check-min-schema-migrate'	DJ Mountney	2019-06-28	119	-512/+2357
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/database.rb
\| * \| \| \| \| \| \| \| \|	Add the frozen literal to the correct file	DJ Mountney	2019-06-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Drop the source upgrade change	DJ Mountney	2019-06-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We no longer need to point people away from using db:migrate
\| * \| \| \| \| \| \| \| \|	Add an flag for skipping the schema version check	DJ Mountney	2019-06-25	2	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you chose to use the rollback migration feature on your current version for example, you should still have a way to migrate, being that you are still on a supported migration path.
\| * \| \| \| \| \| \| \| \|	Move min schema version check to db:migrate	DJ Mountney	2019-06-25	2	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than have it checked only as part of gitlab:db:configure, we will instead have it as a pre-req for every db:migrate command
\| * \| \| \| \| \| \| \| \|	Check supported version when migrating	DJ Mountney	2019-06-25	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the mininum supported migration version to be the schema version as of 11.11.0, and errors you if that is not detected during gitlab:db:configure
* \| \| \| \| \| \| \| \| \|	Allow collapsing all issue boards	Martin Hanzel	2019-06-28	1	-29/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All issue boards can now be collapsed via a button, re-ordered by dragging the header, and the vertical collapsed header style was reworked.
* \| \| \| \| \| \| \| \| \|	Merge branch '63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics' ↵	Stan Hu	2019-06-28	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use PROCESS_CPUTIME_ID for cpu time metrics Closes #63874 See merge request gitlab-org/gitlab-ce!30166
\| * \| \| \| \| \| \| \| \| \|	Fix spec definitions63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics	Aleksei Lipniagov	2019-06-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'leipert-absolute-scss-paths' into 'master'	Mike Greiling	2019-06-28	5	-26/+30
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use absolute paths for SCSS imports See merge request gitlab-org/gitlab-ce!30161