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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'docs/post-merge-pipelines' into 'master'	Marcia Ramos	2018-11-20	2	-0/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on post-merge pipelines Closes #53527 See merge request gitlab-org/gitlab-ce!23054
\| *	Add docs on post-merge pipelinesdocs/post-merge-pipelines	Achilleas Pipinellis	2018-11-20	2	-2/+30
\| \|
* \|	Merge branch 'docs/direct-link-review-apps' into 'master'	Marcia Ramos	2018-11-20	3	-8/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for linking in changed pages from MR widget Closes #53420 See merge request gitlab-org/gitlab-ce!22990
\| * \|	Add docs for linking in changed pages from MR widgetdocs/direct-link-review-apps	Achilleas Pipinellis	2018-11-16	3	-8/+26
\| \| \|
* \| \|	Merge branch 'revert-e2aa2177' into 'master'	Sean McGivern	2018-11-20	18	-756/+1275
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" See merge request gitlab-org/gitlab-ce!23229
\| * \| \|	Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"revert-e2aa2177	Sean McGivern	2018-11-20	18	-756/+1275
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !23140
* \| \| \|	Merge branch 'project_identicon_fix' into 'master'	Kushal Pandya	2018-11-20	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a project icon in home panel view, #51157. Closes #51157 See merge request gitlab-org/gitlab-ce!23166
\| * \| \| \|	Add changelog item for changes.	Harry Kiselev	2018-11-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is last commit that closes #51157 issue.
\| * \| \| \|	Fix a project icon in home panel view, #51157.	Harry Kiselev	2018-11-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gt-change-breadcrumb-title-for-contribution-charts' into 'master'	Kushal Pandya	2018-11-20	4	-3/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change breadcrumb title for contribution charts Closes #44567 See merge request gitlab-org/gitlab-ce!23071
\| * \| \| \| \|	Change breadcrumb title for contribution charts	George Tsiolis	2018-11-14	4	-3/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'image-diff-size-fix' into 'master'	Filipa Lacerda	2018-11-20	4	-35/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the dimensions of image diffs Closes #54236 See merge request gitlab-org/gitlab-ce!23195
\| * \| \| \| \| \|	Fixed the dimensions of image diffs	Phil Hughes	2018-11-20	4	-35/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54236
* \| \| \| \| \| \|	Merge branch 'docs/minor-aws-fixes' into 'master'	Achilleas Pipinellis	2018-11-20	2	-17/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes to AWS documentation See merge request gitlab-org/gitlab-ce!23198
\| * \| \| \| \| \| \|	Fixes to AWS documentation	Brendan O'Leary 🐢	2018-11-20	2	-17/+22
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix/allow-saml2-for-2fa-bypass' into 'master'	Douwe Maan	2018-11-20	3	-1/+68
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses See merge request gitlab-org/gitlab-ce!22568
\| * \| \| \| \| \| \|	saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses	115100	2018-10-25	3	-1/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ce/#53102.
* \| \| \| \| \| \| \|	Merge branch '40085-add-a-create_merge_request-quick-action' into 'master'	Douwe Maan	2018-11-20	11	-6/+182
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add a `/create_merge_request` quick action" Closes #40085 See merge request gitlab-org/gitlab-ce!22485
\| * \| \| \| \| \| \| \|	Creates /create_merge_request quickaction40085-add-a-create_merge_request-quick-action	Jacopo	2018-11-14	11	-6/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With this quick action the user can create a new MR starting from the current issue using as `source_branch` the given `branch name` and as `target_branch` the project default branch. If the `branch name` is omitted a name is automatically created starting from the issue title.
* \| \| \| \| \| \| \| \|	Merge branch '3062-improve-project-cache' into 'master'	Douwe Maan	2018-11-20	5	-16/+42
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change project cache key to depend on ID instead of full path Closes #42191 See merge request gitlab-org/gitlab-ce!23135
\| * \| \| \| \| \| \| \| \|	Add `wiki` extra namespace when repository is_wiki: true3062-improve-project-cache	Gabriel Mazetto	2018-11-16	2	-2/+28
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change specs to accept new cache keys for projects	Gabriel Mazetto	2018-11-16	1	-11/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change project pipeline status cache key to follow project convention	Gabriel Mazetto	2018-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Old cache key was: `projects/#{id}/pipeline_status/#{sha}` New one is: `project:#{id}:pipeline_status:#{sha}` This allows to delete any project related key just by scanning for: `project:#{id}`.
\| * \| \| \| \| \| \| \| \|	Change project cache key to depend on ID instead of full path	Gabriel Mazetto	2018-11-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, project cache used as part of the namespace the `full_path`, which included namespace and project slug. That meant that anytime a project was renamed or transfered to a different namespace, we would lose the existing cache. This is not necessary, nor desired. I've prefixed cache key with `project:` to make it easy to find in redis if necessary as well as make it possible to purge all project related cache. I've also switched the cache key type to go after the initial namespace and not before.
* \| \| \| \| \| \| \| \| \|	Merge branch 'osw-mention-when-ff-revert-should-be-picked' into 'master'	Robert Speicher	2018-11-20	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve FF "pick after the 7th" docs See merge request gitlab-org/gitlab-ce!23185
\| * \| \| \| \| \| \| \| \|	Improve FF "pick after the 7th" docsosw-mention-when-ff-revert-should-be-picked	Oswaldo Ferreira	2018-11-19	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'gt-externalize-app-views-projects-environments' into 'master'	Kushal Pandya	2018-11-20	11	-34/+70
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/projects/environments` See merge request gitlab-org/gitlab-ce!23210
\| * \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/projects/environments`	George Tsiolis	2018-11-19	11	-34/+70
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gt-externalize-app-views-u2f' into 'master'	Kushal Pandya	2018-11-20	3	-16/+52
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/u2f` See merge request gitlab-org/gitlab-ce!23201
\| * \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/u2f`	George Tsiolis	2018-11-20	3	-16/+52
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'drop-default-value-status-deployments' into 'master'	Kamil Trzciński	2018-11-20	3	-2/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop default value on status column in deployments table Closes #53702 See merge request gitlab-org/gitlab-ce!22971
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master-ce' into drop-default-value-status-deployments	Shinya Maeda	2018-11-20	129	-1227/+1429
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary codedrop-default-value-status-deployments	Shinya Maeda	2018-11-19	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add changelog	Shinya Maeda	2018-11-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master-ce' into drop-default-value-status-deployments	Shinya Maeda	2018-11-19	605	-3309/+6386
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix nil	Shinya Maeda	2018-11-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary line in schema.rb	Shinya Maeda	2018-11-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Drop default value on status column in deployments table	Shinya Maeda	2018-11-13	2	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/dangerfile' into 'master'	Achilleas Pipinellis	2018-11-20	1	-18/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the table of tech writers and stages more compact See merge request gitlab-org/gitlab-ce!23153
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the table of tech writers and stages more compactdocs/dangerfile	Achilleas Pipinellis	2018-11-16	1	-18/+9
\| \| \|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Steve Azzopardi	2018-11-20	8	-11/+90
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	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 '53290-incorrect-project-list-order-select-default-label' into ↵	Grzegorz Bizon	2018-11-20	3	-1/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Incorrect project list order select default label" Closes #53290 See merge request gitlab-org/gitlab-ce!23058
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix default sorting for subgroups and projects list53290-incorrect-project-list-order-select-default-label	Jacopo	2018-11-14	3	-1/+13
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|