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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backport EE changes to config/application.rbconfig-application-differences	Yorick Peterse	2019-06-17	1	-0/+30
\| \| \| \| \| \|	This backports the EE changes made to this config file to CE. EE specific bits do not need an `if Gitlab.ee?`, as everything will work transparently when using CE.
*	Merge branch 'container-registry-api-perms-58271' into 'master'	Kamil Trzciński	2019-06-17	6	-10/+12
\|\ \| \| \| \| \| \| \| \|	Align Container Registry API Delete Permissions with UI See merge request gitlab-org/gitlab-ce!29512
\| *	Allow Developer role to delete tags via container registry api	Jason Goodman	2019-06-17	6	-10/+12
\|/ \| \| \|	This brings the API permissions in line with the UI permissions
*	Merge branch '35428-docker-registry-date-not-accurate' into 'master'	Filipa Lacerda	2019-06-17	3	-4/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Docker registry date not accurate" Closes #35428 See merge request gitlab-org/gitlab-ce!29464
\| *	Resolve "Docker registry date not accurate"	Nick Kipling	2019-06-17	3	-4/+10
\|/
*	Merge branch '8429-enforce-template-inclusion-in-pipelines-fe-backport' into ↵	Filipa Lacerda	2019-06-17	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	'master' Backporting required template form on admin CI/CD See merge request gitlab-org/gitlab-ce!29154
\| *	Backporting an EE admin form8429-enforce-template-inclusion-in-pipelines-fe-backport	Scott Hampton	2019-06-13	1	-0/+2
\| \| \| \| \| \| \| \| \| \|	EE added a required template form on the CI/CD page. This is a backport for that change.
* \|	Merge branch 'boolean-values-from-matches-operator' into 'master'	Kamil Trzciński	2019-06-17	3	-59/+28
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	return boolean from Pipeline::Expression::Lexeme::Matches#evaluate See merge request gitlab-org/gitlab-ce!29717
\| * \|	Return boolean from Lexeme::Matches#evaluateboolean-values-from-matches-operator	drew cimino	2019-06-14	3	-59/+28
\| \| \|
* \| \|	Merge branch 'sh-fix-issue-63158' into 'master'	Rémy Coutable	2019-06-17	5	-1/+79
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inability to set visibility_level on project via API Closes #63158 See merge request gitlab-org/gitlab-ce!29578
\| * \| \|	Fix inability to set visibility_level on project via APIsh-fix-issue-63158	Stan Hu	2019-06-14	5	-1/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consider the scenario: 1. The default visibility level is set to internal 2. A user attempts to create a private project within a private group Previously this would always fail because default_value_for would overwrite the private visibility setting, no matter what visibility_level were specified. This was happening because default_value_for was confused by the default value of 0 specified by the database schema. default_value_for attempts to assign the default value in the block by checking whether the attribute has changed. The problem is that since the default value by the database was 0, and the user requested 0, this appeared as though no changes were made. As a result, default_value_for would always overwrite the user's preference. To fix this, we remove the use of default_value_for and only set the visibility level to the default application setting when no preference has been given at creation time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63158
* \| \| \|	Merge branch 'revert-3a50fc5d' into 'master'	Filipa Lacerda	2019-06-17	25	-150/+54
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'" See merge request gitlab-org/gitlab-ce!29684
\| * \| \| \|	Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5d	Kamil Trzciński	2019-06-14	25	-150/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26853
* \| \| \| \|	Merge branch '62910-task-completion-status-gql-pderichs' into 'master'	Sean McGivern	2019-06-17	6	-1/+81
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make task completion status available via GraphQL Closes #62910 See merge request gitlab-org/gitlab-ce!29573
\| * \| \| \| \|	Add task count and completed count to graphql types62910-task-completion-status-gql-pderichs	Patrick Derichs	2019-06-15	6	-1/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for task completion status (graphql) Fix style issues Changed format of constants in spec Refactor specs to reduce creation of records Reduce parameters to merge request creation Use set's for project and user Move let's out of it_behaves_like block Fix description parameter Fix format of lets Use dig to get task completion status out of graphql response Modified rspec output Add changelog entry
* \| \| \| \| \|	Merge branch 'sh-clean-query-recorder-backtrace' into 'master'	Sean McGivern	2019-06-17	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean QueryRecorder backtrace See merge request gitlab-org/gitlab-ce!29724
\| * \| \| \| \| \|	Clean QueryRecorder backtracesh-clean-query-recorder-backtrace	Stan Hu	2019-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it much easier to debug N+1 queries via QueryRecorder by eliminating unnecessary lines.
* \| \| \| \| \| \|	Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'	Kushal Pandya	2019-06-17	1	-3/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make changes suggested by Pedro for UX See merge request gitlab-org/gitlab-ce!29324
\| * \| \| \| \| \| \|	Apply improved styling based on UX feedbackgitlab-ui-259-style-checkboxes	Sam Bigelow	2019-06-12	1	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Only apply extra margins and borders between checkbox components - Change cursor to `not-allowed` when checkbox is disabled - Adjust handling of inline checkbox styling vs block
* \| \| \| \| \| \| \|	Merge branch 'docs-existing-knative' into 'master'	Evan Read	2019-06-17	1	-0/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on using serverless with existing Knative instance See merge request gitlab-org/gitlab-ce!29699
\| * \| \| \| \| \| \| \|	Add documentation on using serverless with existing Knative instance	Daniel Gruesso	2019-06-17	1	-0/+9
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-bump-ruby-labkit' into 'master'	Ash McKenzie	2019-06-17	2	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gitlab-labkit to 0.3.0 See merge request gitlab-org/gitlab-ce!29728
\| * \| \| \| \| \| \| \|	Upgrade gitlab-labkit to 0.3.0	Stan Hu	2019-06-17	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This matches the version used in Gitaly, bumps the gRPC version to be aligned with GitLab CE/EE, and adds gRPC interceptor support: https://gitlab.com/gitlab-org/labkit-ruby/compare/v0.2.0...v0.3.0
* \| \| \| \| \| \| \| \|	Merge branch 'docs-university-link' into 'master'	Evan Read	2019-06-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix link in university support doc See merge request gitlab-org/gitlab-ce!29582
\| * \| \| \| \| \| \| \| \|	Docs: Fix link in university support doc	Marcel Amirault	2019-06-17	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs-sso-enforce-note' into 'master'	Evan Read	2019-06-17	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: SSO Groups: Add login session note See merge request gitlab-org/gitlab-ce!29628
\| * \| \| \| \| \| \| \| \|	Add login session notedocs-sso-enforce-note	Cynthia Ng	2019-06-13	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-bump-mime-types-data' into 'master'	Ash McKenzie	2019-06-17	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade mime-types-data to 3.2019.0331 See merge request gitlab-org/gitlab-ce!29729
\| * \| \| \| \| \| \| \| \| \|	Fix send_file_upload_spec.rb with right MIME type	Stan Hu	2019-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a regression in mime-types-data: https://github.com/mime-types/mime-types-data/pull/20
\| * \| \| \| \| \| \| \| \| \|	Upgrade mime-types-data to 3.2019.0331sh-bump-mime-types-data	Stan Hu	2019-06-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves some disk space by matching the version used in Gitaly. Only minor changes: https://github.com/mime-types/mime-types-data/blob/master/History.md
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/grammar' into 'master'	Ray Paik	2019-06-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Docs] Fix minor grammar issue See merge request gitlab-org/gitlab-ce!29716
\| * \| \| \| \| \| \| \| \| \|	Fix minor grammar issue	Arun Kumar Mohan	2019-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-bump-msgpack' into 'master'	Ash McKenzie	2019-06-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump msgpack to 1.2.10 See merge request gitlab-org/gitlab-ce!29730
\| * \| \| \| \| \| \| \| \| \| \|	Bump msgpack to 1.2.10sh-bump-msgpack	Stan Hu	2019-06-15	1	-1/+1
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves some space by matching the version used by Gitaly. List of changes: * https://github.com/msgpack/msgpack-ruby/blob/master/ChangeLog * https://github.com/msgpack/msgpack-ruby/compare/v1.2.6..v1.2.10
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/edit-after-script-context' into 'master'	Achilleas Pipinellis	2019-06-16	2	-14/+20
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit after script context text See merge request gitlab-org/gitlab-ce!29583
\| * \| \| \| \| \| \| \| \| \| \|	Edit after script context text	Evan Read	2019-06-16	2	-14/+20
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'say-dependency-list-is-from-gemnasium-docs' into 'master'	Achilleas Pipinellis	2019-06-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Say that the dependency list is from Gemnasium See merge request gitlab-org/gitlab-ce!29673
\| * \| \| \| \| \| \| \| \| \| \|	Say that the dependency list is from Gemnasium	Fabien Catteau	2019-06-16	1	-1/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it explicit that the dependency list is generated from Gemnasium.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-71' into 'master'	Stan Hu	2019-06-15	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken hyperlink in reducing_the_repo_size_using_git.md See merge request gitlab-org/gitlab-ce!29727
\| * \| \| \| \| \| \| \| \| \|	Fix broken hyperlink in reducing_the_repo_size_using_git.md	Tom Forbes	2019-06-15	1	-3/+3
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'pendo-poc' into 'master'	Tim Zallmann	2019-06-15	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Pendo POC snippet See merge request gitlab-org/gitlab-ce!29439
\| * \| \| \| \| \| \| \| \| \|	Backport: Pendo POC snippet	Donald Cook	2019-06-15	1	-0/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'renovate/gitlab-ui-4.x' into 'master'	Clement Ho	2019-06-15	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^4.1.0 See merge request gitlab-org/gitlab-ce!29707
\| * \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^4.1.0	null	2019-06-14	2	-5/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' ↵	Fatih Acet	2019-06-14	3	-23/+38
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge request tabs do not handle ctrl+click correctly" Closes #57813 See merge request gitlab-org/gitlab-ce!29506
\| * \| \| \| \| \| \| \| \|	Allow command and control click to work on MR tabs57813-merge-request-tabs-do-not-handle-ctrl-click-correctly	Sam Bigelow	2019-06-12	3	-23/+38
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '62149-ci-review-apps-change-pullpolicy-sidekiq-and-unicorn' ↵	Stan Hu	2019-06-14	2	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [CI Review Apps] Change `pullPolicy` to `Always` for `gitlab.sidekiq.image` and `gitlab.unicorn.image` and pass `FORCE_RAILS_IMAGE_BUILDS=true` to the `CNG-mirror` triggered pipeline to always rebuild the Rails image Closes #62149 See merge request gitlab-org/gitlab-ce!28592
\| * \| \| \| \| \| \| \|	Apply suggestion to scripts/review_apps/review-apps.sh62149-ci-review-apps-change-pullpolicy-sidekiq-and-unicorn	Rémy Coutable	2019-06-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Pass FORCE_RAILS_IMAGE_BUILDS=true to the CNG triggered pipeline	Rémy Coutable	2019-06-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	[Review Apps] Set `global.imagePullPolicy: Always`	Rémy Coutable	2019-06-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>