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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '52712-further-ui-improvements-to-profile-overview-tab' into ↵	Phil Hughes	2018-11-20	8	-106/+98
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Further UI improvements to Profile "Overview" tab" Closes #52712 See merge request gitlab-org/gitlab-ce!22977
\| * \| \| \| \| \| \| \| \| \|	Resolve "Further UI improvements to Profile "Overview" tab"	Martin Wortschack	2018-11-20	8	-106/+98
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-8448-ce' into 'master'	Steve Azzopardi	2018-11-20	1	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stub Rails.application.env_config to prevent spec failures Closes gitlab-ee#8488 See merge request gitlab-org/gitlab-ce!23222
\| * \| \| \| \| \| \| \| \| \|	Stub Rails.application.env_config to prevent spec failuressh-fix-issue-8448-ce	Stan Hu	2018-11-19	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we modify env_config, that is on the global Rails.application, and we need to stub it and allow it to be modified in-place, without polluting later tests. When we modify env, then the context is a request, or something else that only lives for a single spec. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8488
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-booklist-link' into 'master'	Achilleas Pipinellis	2018-11-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change link to help broken link checker See merge request gitlab-org/gitlab-ce!23220
\| * \| \| \| \| \| \| \| \| \| \|	Change link to help broken link checkerdocs/fix-booklist-link	Evan Read	2018-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '54015-Markdown-Editor-improve-Cursor-placement' into 'master'	Kushal Pandya	2018-11-20	3	-9/+38
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refine cursor positioning in Markdown Editor for wrap tags. Closes #54015 See merge request gitlab-org/gitlab-ce!23085
\| * \| \| \| \| \| \| \| \| \| \| \|	Refine cursor positioning in Markdown Editor for wrap tags.	Johann Hubert Sonntagbauer	2018-11-20	3	-9/+38
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-unused-partial' into 'master'	Sean McGivern	2018-11-20	1	-5/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused partial See merge request gitlab-org/gitlab-ce!23180
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused partial	Heinrich Lee Yu	2018-11-19	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-improve-gitaly-pb' into 'master'	Sean McGivern	2018-11-20	18	-1275/+756
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show what RPC is called in the performance bar See merge request gitlab-org/gitlab-ce!23140
\| * \| \| \| \| \| \| \| \| \| \|	Remove duplicate tests for Gitaly	Zeger-Jan van de Weg	2018-11-19	14	-1152/+741
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The disabling of Gitaly was basically stubbing `Feature.enabled?` call, which was never triggered.
\| * \| \| \| \| \| \| \| \| \| \|	Show what RPC is called in the performance bar	Zeger-Jan van de Weg	2018-11-16	4	-123/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now only the data was shown of the service, which is not valueable at times given some of those expose a lot of RPCs.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Evan Read	2018-11-20	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53595-allow-requests-to-local-network-requirement-yaml-include-docs' into 'master' Update docs for include to mention 'allow requests to local network' requirement Closes #53595 See merge request gitlab-org/gitlab-ce!23055
\| * \| \| \| \| \| \| \| \| \| \| \|	Update docs for include to mention 'allow requests to local network' requirement	Daniel Fernau	2018-11-20	1	-0/+5
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'frozen-string-lib-gitlab-even-even-more' into 'master'	Stan Hu	2018-11-20	103	-3/+213
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable even more frozen string for lib/gitlab See merge request gitlab-org/gitlab-ce!23161
\| * \| \| \| \| \| \| \| \| \| \|	Enable even more frozen string for lib/gitlab	gfyoung	2018-11-16	103	-3/+213
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables frozen string for the following: * lib/gitlab/hook_data/*/.rb * lib/gitlab/i18n/*/.rb * lib/gitlab/import/*/.rb * lib/gitlab/import_export/*/.rb * lib/gitlab/kubernetes/*/.rb * lib/gitlab/legacy_github_import/*/.rb * lib/gitlab/manifest_import/*/.rb * lib/gitlab/metrics/*/.rb * lib/gitlab/middleware/*/.rb Partially addresses gitlab-org/gitlab-ce#47424.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-bump-gems-security' into 'master'	Douglas Barbosa Alexandre	2018-11-19	4	-16/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump nokogiri, loofah, and rack gems for security updates See merge request gitlab-org/gitlab-ce!23204
\| * \| \| \| \| \| \| \| \| \| \|	Bump nokogiri, loofah, and rack gems for security updates	Stan Hu	2018-11-19	4	-16/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	loofah: CVE-2018-16468: https://github.com/flavorjones/loofah/issues/154 nokogiri: CVE-2018-14404 and CVE-2018-14567 https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md rack: CVE-2018-16471 https://github.com/rack/rack/commit/e5d58031b766e49687157b45edab1b8457d972bd i18n: https://github.com/svenfuchs/i18n/releases concurrent-ruby: https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md