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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'sh-fix-issue-54189' into 'master'	Steve Azzopardi	2018-11-20	4	-1/+37
\|\ \| \| \| \| \| \| \| \|	[master] Prevent templated services from being imported See merge request gitlab/gitlabhq!2634
\| *	Prevent templated services from being imported	Stan Hu	2018-11-19	4	-1/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Templated services should only be created by admins and does not apply to project import/export. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54189
* \|	Merge branch 'security-2717-xss-username-autocomplete' into 'master'	Steve Azzopardi	2018-11-20	3	-10/+39
\|\ \ \| \|/ \|/\| \| \| \| \|	[master] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2605
\| *	Add changelog entry	Kushal Pandya	2018-11-12	1	-0/+5
\| \|
\| *	Fix user name autocomplete XSS when name contains HTML	Kushal Pandya	2018-11-12	2	-10/+34
\| \|
* \|	Update CHANGELOG.md for 11.4.6	GitLab Release Tools Bot	2018-11-18	1	-0/+7
\| \| \| \| \| \|	[ci skip]
* \|	Update CHANGELOG.md for 11.3.10	GitLab Release Tools Bot	2018-11-18	1	-0/+7
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch '53700-hashed-storagemigration' into 'master'	Stan Hu	2018-11-16	3	-1/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hashed Storage: allow migration to be retried in partially migrated projects Closes #53700 See merge request gitlab-org/gitlab-ce!23087
\| * \|	Allow partially migrated repositories to continue migration53700-hashed-storagemigration	Gabriel Mazetto	2018-11-15	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we verified if the projecthave at least migrated their repository to hashed storage and prevented the migration command to start a new migration. The new version checks for the latest storage version available (fully migrated), otherwise it allows migration to be triggered again.
* \| \|	Merge branch 'winh-application-css-pages' into 'master'	Clement Ho	2018-11-16	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide application.css from master branch via GitLab Pages Closes gitlab-ui#95 See merge request gitlab-org/gitlab-ce!23156
\| * \| \|	Provide application.css from master branch via GitLab Pages	Winnie Hellmann	2018-11-16	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'remove-unneeded-license-refs' into 'master'	Clement Ho	2018-11-16	2	-9/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove unneeded licenses for gitlab-org npm namsepace See merge request gitlab-org/gitlab-ce!23155
\| * \| \|	Remove unneeded licenses for gitlab-org npm namsepace	Mike Greiling	2018-11-16	2	-9/+1
\| \| \| \|
* \| \| \|	Merge branch 'docs-milestones-sprints-releases' into 'master'	Victor Wu	2018-11-16	1	-0/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs agile sprints and releases See merge request gitlab-org/gitlab-ce!22855
\| * \| \| \|	Docs agile sprints and releases	Victor Wu	2018-11-16	1	-0/+20
\|/ / / /
* \| \| \|	Merge branch '53813-test-compilation-against-multiple-node-versions' into ↵	Mike Greiling	2018-11-16	1	-0/+33
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Check compilation of FE assets against multiple node versions Closes #53813 See merge request gitlab-org/gitlab-ce!23068
\| * \| \|	Check compilation of FE assets against multiple node versions53813-test-compilation-against-multiple-node-versions	Lukas Eipert	2018-11-14	1	-0/+33
\| \| \| \|
* \| \| \|	Merge branch 'npm-namespace' into 'master'	Mike Greiling	2018-11-16	105	-122/+210
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use @gitlab npm namespace Closes gitlab-ui#65 See merge request gitlab-org/gitlab-ce!22629
\| * \| \| \|	Use @gitlab npm namespace	Clement Ho	2018-11-16	105	-122/+210
\|/ / / /
* \| \| \|	Merge branch 'docs-patch-31' into 'master'	Achilleas Pipinellis	2018-11-16	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minor: format fix for GH import page See merge request gitlab-org/gitlab-ce!23152
\| * \| \| \|	minor: format fix for GH import pagedocs-patch-31	Cynthia Ng	2018-11-16	1	-0/+1
\|/ / / /
* \| \| \|	Merge branch 'git-protocol-v2-docs' into 'master'yorick-revert-test-master	Achilleas Pipinellis	2018-11-16	1	-1/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information on support for git v2 in docs See merge request gitlab-org/gitlab-ce!23138
\| * \| \| \|	Add information on support for git v2 in docs	Balasankar "Balu" C	2018-11-16	1	-1/+9
\|/ / / /
* \| \| \|	Merge branch 'lm-update-architecture-docs' into 'master'	Achilleas Pipinellis	2018-11-16	1	-23/+166
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update architecture.md to have a component by component overview See merge request gitlab-org/gitlab-ce!22472
\| * \| \| \|	Update architecture.md to have a component by component overview	Lee Matos	2018-11-16	1	-23/+166
\|/ / / /
* \| \| \|	Merge branch 'docs/fix_changelog_type_documentation' into 'master'	Achilleas Pipinellis	2018-11-16	1	-9/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing `performance` to changelog type doc See merge request gitlab-org/gitlab-ce!22733
\| * \| \| \|	Add missing `performance` to changelog type docdocs/fix_changelog_type_documentation	Philippe Lafoucrière	2018-11-01	1	-9/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch 'validate-that-foreign-keys-are-created' into 'master'	Sean McGivern	2018-11-16	5	-6/+189
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate that foreign keys are indexed and created Closes #50875 See merge request gitlab-org/gitlab-ce!22808
\| * \| \| \| \|	Add missing cluster_id on knativevalidate-that-foreign-keys-are-created	Kamil Trzciński	2018-11-15	2	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Update CHANGELOG	Kamil Trzciński	2018-11-15	2	-7/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Remove indexes for FK	Kamil Trzciński	2018-11-15	1	-1/+26
\| \| \| \| \| \|
\| * \| \| \| \|	Backport EE changes	Kamil Trzciński	2018-11-15	1	-1/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Validate foreign keys being indexed	Kamil Trzciński	2018-11-15	6	-6/+160
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/remove-rails5-gemfile'	Kamil Trzciński	2018-11-15	1	-7/+0
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge branch '41875-allow-pipelines-to-be-deleted-by-project-owners' into ↵	Grzegorz Bizon	2018-11-16	8	-0/+193
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Allow pipelines to be deleted by project owners" Closes #41875 See merge request gitlab-org/gitlab-ce!22988
\| * \| \| \| \| \| \|	Add spec for Pipeline DELETE for developers41875-allow-pipelines-to-be-deleted-by-project-owners	Matija Čupić	2018-11-13	1	-4/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Raise exception when user is not authorized	Matija Čupić	2018-11-13	2	-9/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Authorize DestroyPipelineService against pipeline	Matija Čupić	2018-11-13	5	-4/+25
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move pipeline delete docs to end	Matija Čupić	2018-11-13	1	-17/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add docs for deleting a pipeline via API	Matija Čupić	2018-11-12	1	-0/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add CHANGELOG entry	Matija Čupić	2018-11-12	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Destroy pipeline in service	Matija Čupić	2018-11-12	5	-16/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move all logic for destroying a Pipeline into a service so it's easily reusable.
\| * \| \| \| \| \| \|	Implement MVC for Pipeline deletion API	Matija Čupić	2018-11-12	2	-0/+62
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gt-rename-diffs-store-variable' into 'master'	Phil Hughes	2018-11-16	5	-9/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename diffs store variable See merge request gitlab-org/gitlab-ce!23123
\| * \| \| \| \| \| \| \|	Rename diffs store variable	George Tsiolis	2018-11-15	5	-9/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'gt-replace-weight-icon-ce' into 'master'	Kushal Pandya	2018-11-16	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace weight icon See merge request gitlab-org/gitlab-ce!23144
\| * \| \| \| \| \| \| \| \|	Replace weight icon	George Tsiolis	2018-11-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-enums-for-ee' into 'master'	Robert Speicher	2018-11-16	7	-34/+82
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor how a few ActiveRecord enums are defined See merge request gitlab-org/gitlab-ce!23024
\| * \| \| \| \| \| \| \| \| \|	Refactor how a few ActiveRecord enums are definedrefactor-enums-for-ee	Yorick Peterse	2018-11-15	7	-34/+82
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In a few models we define ActiveRecord enums that are redefined in EE using the following pattern: enum :some_enum, { ... }.merge(EE_ENUM_VALUES) This particular approach is problematic to deal with, because it requires that we `prepend` and EE module _before_ defining the enum. This typically translates to the `prepend` being the first line in the model in EE, but this can easily lead to merge conflicts when developers add more `include` and/or `prepend` lines. As part of https://gitlab.com/gitlab-org/gitlab-ee/issues/8244 and https://gitlab.com/gitlab-org/gitlab-ee/issues/8241 we are moving `prepend` to the last line in a file, reducing the chances of running into merge conflicts. This poses a bit of a problem with the pattern above, because this pattern does not allow us to move the `prepend` further down a file. To resolve this problem, we simply move the Hash value of the enum to a separate class method. This method is defined in a separate module where necessary, allowing us to use it like so: enum :failure_reasons, ::SomeModelEnums.failure_reasons The method in turn is defined in a very straightforward manner: module SomeModelEnums def self.failure_reasons { ... } end end This makes it easy for EE to add values without requiring the `prepend` to be placed before the `enum` is defined. For more information, see the following issues and merge requests: * https://gitlab.com/gitlab-org/gitlab-ee/issues/8244 * https://gitlab.com/gitlab-org/gitlab-ee/issues/8241 * https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8424
* \| \| \| \| \| \| \| \| \|	Merge branch 'image-discussion-ff-fix' into 'master'	Filipa Lacerda	2018-11-16	3	-13/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed image discussion styling Closes #54110 See merge request gitlab-org/gitlab-ce!23127