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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removes EE differences12532-services-form	Filipa Lacerda	2019-07-01	1	-1/+1
\|
*	Merge branch 'vue-i18n-js-pipelines-directory' into 'master'	Kushal Pandya	2019-07-01	3	-4/+7
\|\ \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/pipelines directory See merge request gitlab-org/gitlab-ce!30015
\| *	Vue-i18n: app/assets/javascripts/pipelines directoryvue-i18n-js-pipelines-directory	Ezekiel Kigbo	2019-07-01	3	-4/+7
\| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/pipelines directory
* \|	Merge branch 'vue-i18n-js-pages-directory' into 'master'	Kushal Pandya	2019-07-01	4	-9/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/pages directory See merge request gitlab-org/gitlab-ce!29978
\| * \|	Moved feature access arrays to constantsvue-i18n-js-pages-directory	Ezekiel Kigbo	2019-07-01	3	-7/+41
\| \| \|
\| * \|	Vue-i18n: app/assets/javascripts/pages directory	Ezekiel Kigbo	2019-07-01	3	-7/+18
\| \|/ \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/pages directory
* \|	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 'update-default_value_for-to-3-2-0' into 'master'	Nick Thomas	2019-07-01	2	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the 'default_value_for' gem to 3.2.0 Closes default_value_for#1 See merge request gitlab-org/gitlab-ce!30173
\| * \| \|	Update the 'default_value_for' gem to 3.2.0update-default_value_for-to-3-2-0	Rémy Coutable	2019-07-01	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'move-colon-on-merge-request-notification' into 'master'	Douwe Maan	2019-07-01	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move colon on merge request notification See merge request gitlab-org/gitlab-ce!30178
\| * \| \| \|	Move colon on merge request notification	George Tsiolis	2019-07-01	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-fix-issue-63910' into 'master'	Sean McGivern	2019-07-01	3	-3/+45
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \|	Merge branch 'vue-i18n-js-serverless-directory' into 'master'	Filipa Lacerda	2019-07-01	4	-19/+65
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/serverless directory See merge request gitlab-org/gitlab-ce!30016
\| * \| \| \| \| \|	Vue-i18n: app/assets/javascripts/serverless directory	Ezekiel Kigbo	2019-07-01	4	-19/+65
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/serverless directory
* \| \| \| \| \|	Merge branch 'vue-i18n-various-js-directories' into 'master'	Filipa Lacerda	2019-07-01	6	-16/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: various js directories See merge request gitlab-org/gitlab-ce!29883
\| * \| \| \| \| \|	Vue-i18n: various js directories	Ezekiel Kigbo	2019-07-01	6	-16/+31
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the directories: - app/assets/javascripts/error_tracking_settings - app/assets/javascripts/filtered_search - app/assets/javascripts/projects - app/assets/javascripts/releases - app/assets/javascripts/repository
* \| \| \| \| \|	Merge branch '44106-include-subgroups-in-group-activity' into 'master'	Bob Van Landuyt	2019-07-01	3	-4/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include events from subgroups in group's activity Closes #44106 See merge request gitlab-org/gitlab-ce!29953
\| * \| \| \| \| \|	Revert "Include subgroups in shared_projects"	Fabian Schneider	2019-07-01	3	-4/+11
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4bed2daef935bb4097988e0eff4830fc13a23c37.
* \| \| \| \| \|	Merge branch '63863-fix-groups-in-email-subject' into 'master'	Sean McGivern	2019-07-01	3	-22/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-22/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-114/+298
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-18/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-133/+170
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-93/+222
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-circuit-breaker-removal-part-deux' into 'master'	Bob Van Landuyt	2019-07-01	3	-40/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-40/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	11	-93/+175
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	11	-93/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract diverging_commit_counts into a service class
* \| \| \| \| \| \| \| \|	Merge branch 'tc-rake-orphan-artifacts' into 'master'	Dmitriy Zaporozhets	2019-07-01	9	-0/+459
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	9	-0/+459
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'bvl-remove-old-fork-check' into 'master'	Dmitriy Zaporozhets	2019-07-01	1	-5/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated `#forked_from?` check See merge request gitlab-org/gitlab-ce!30132
\| * \| \| \| \| \| \| \| \|	Remove deprecated `#forked_from?` check	Bob Van Landuyt	2019-06-28	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I forgot to clean up this bit in we switched the `forked_from_project` relation to use fork networks in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22226
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/clarify-support-for-pipelines-for-mr' into 'master'63863-fix-groups-in-email-subject	Achilleas Pipinellis	2019-07-01	1	-20/+40
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify requirements for pipelines for MRs Closes #62056 See merge request gitlab-org/gitlab-ce!30107
\| * \| \| \| \| \| \| \| \| \|	Clarify requirements for pipelines for MRs	Evan Read	2019-07-01	1	-20/+40
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '45120-fix-ide-editor-to-update-size-on-show-change' into 'master'	Phil Hughes	2019-07-01	3	-14/+88
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-14/+88
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'grantyoung-52703-project-archive-compare-qa' into 'master'	Mark Lapierre	2019-07-01	8	-23/+151
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Add e2e test comparing archives of identically named user projects Closes #52703 See merge request gitlab-org/gitlab-ce!29937
\| * \| \| \| \| \| \| \| \|	First pass at new automated QA API test for #52703	Grant Young	2019-07-01	8	-23/+151
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checks that archives of two different user projects with the same name aren't the same via checksum. I.E. a user can't download the archive of another's project by mistake. To enable the test some enhancements were made. Namely updating the client module to handle more than one API instance and the creation a custom rest call method that downloads to tmp.
* \| \| \| \| \| \| \| \|	Merge branch 'docs-fix-vue-wrapper-link' into 'master'	Evan Read	2019-07-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: minor fix to link format See merge request gitlab-org/gitlab-ce!30098
\| * \| \| \| \| \| \| \| \|	Docs: minor fix to link format	czmj	2019-07-01	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'add-notes-style' into 'master'	Evan Read	2019-07-01	1	-1/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update styleguide.md to add Notes usage guidelines See merge request gitlab-org/gitlab-ce!29429
\| * \| \| \| \| \| \| \| \|	Update styleguide.md to add Notes usage guidelines	Mike Lewis	2019-07-01	1	-1/+18
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'add-clusters-to-deployment' into 'master'	Lin Jen-Shin	2019-07-01	11	-25/+138
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-1/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We still fallback to environment.deployment_platform until we can backfill
\| * \| \| \| \| \| \| \| \|	Drop fallback to deployment platform	Thong Kuah	2019-06-27	2	-21/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \|	Use deployment's cluster for kubernetes prereq	Thong Kuah	2019-06-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A deployment will have a cluster associated on creation if there is one. Otherwise fallback to deployment_platform for legacy deployments.
\| * \| \| \| \| \| \| \| \|	Populate cluster_id when creating a deployment	Thong Kuah	2019-06-27	3	-4/+16
\| \| \| \| \| \| \| \| \| \|