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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Apply suggestion to app/helpers/visibility_level_helper.rbsh-default-visibility-fix	Bob Van Landuyt	2019-06-06	1	-1/+1
\|
*	Set project default visibility to max allowed	Stan Hu	2019-06-05	5	-1/+119
\| \| \| \| \| \| \| \| \| \|	If the default, instance-wide visibility were set to internal but a group were private, the radio button would be set on internal even though that setting were not allowed. We now consider the allowed visibility setting for the group in determining what the default should be. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62298
*	Merge branch 'mh/notes-spec' into 'master'52494-show-functions-per-environment	Mike Greiling	2019-06-05	4	-250/+291
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Migrate old notes app test from Karma to Jest Closes #60335 See merge request gitlab-org/gitlab-ce!28704
\| *	Migrate old notes app test from Karma to Jest	Martin Hanzel	2019-06-05	4	-250/+291
\|/
*	Merge branch 'docs-ssot-pages' into 'master'	Mike Lewis	2019-06-05	7	-121/+118
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: ssot epic - Pages Closes #58178 and #61517 See merge request gitlab-org/gitlab-ce!29144
\| *	Docs: ssot epic - Pages	Marcia Ramos	2019-06-05	7	-121/+118
\|/
*	Merge branch 'master' into 'master'	Dmitriy Zaporozhets	2019-06-05	5	-4/+34
\|\ \| \| \| \| \| \| \| \|	Setup Git client for Jupyter See merge request gitlab-org/gitlab-ce!28783
\| *	Setup Git client for Jupyter	Amit Rathi	2019-06-05	5	-4/+34
\|/
*	Merge branch 'trizzi-master-patch-43016' into 'master'	Dmitriy Zaporozhets	2019-06-05	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Update maven template with correct link See merge request gitlab-org/gitlab-ce!29149
\| *	Update maven template with correct linktrizzi-master-patch-43016	Tim Rizzi	2019-06-04	1	-2/+2
\| \|
* \|	Merge branch 'docs/clarify-2fa-grace-period' into 'master'	Achilleas Pipinellis	2019-06-05	3	-19/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Clarify and improve 2FA configuration information See merge request gitlab-org/gitlab-ce!29028
\| * \|	Clarify and improve 2FA configuration information	Evan Read	2019-06-05	3	-19/+16
\|/ /
* \|	Merge branch 'docs-fix-note-and-links' into 'master'	Achilleas Pipinellis	2019-06-05	1	-10/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fixes note, inline links See merge request gitlab-org/gitlab-ce!29065
\| * \|	Fixes note, inline linksdocs-fix-note-and-links	Marcia Ramos	2019-06-03	1	-10/+4
\| \| \|
* \| \|	Merge branch 'docs/ssot_admin_area_usage_statistics' into 'master'	Achilleas Pipinellis	2019-06-05	1	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit Admin Area's "Usage Statistics" for SSOT See merge request gitlab-org/gitlab-ce!29110
\| * \| \|	Edit Admin Area's "Usage Statistics" for SSOT	Russell Dickenson	2019-06-05	1	-0/+16
\|/ / /
* \| \|	Merge branch 'patch-66' into 'master'	Achilleas Pipinellis	2019-06-05	2	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disable Rugged when switching to Gitaly without NFS See merge request gitlab-org/gitlab-ce!29086
\| * \| \|	disable Rugged when switching to Gitaly without NFS	Ben Bodenmiller	2019-06-05	2	-1/+5
\|/ / /
* \| \|	Merge branch 'patch-33' into 'master'	Achilleas Pipinellis	2019-06-05	1	-5/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deprecate the French “écriture inclusive” See merge request gitlab-org/gitlab-ce!28861
\| * \| \|	deprecate the French “écriture inclusive”	Davy Defaud	2019-06-05	1	-5/+3
\|/ / /
* \| \|	Merge branch 'ee-11169-add-link-to-gemnasium-db-doc' into 'master'	Achilleas Pipinellis	2019-06-05	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain how to contribute new vulnerabilities to Dependency Scanning (docs) See merge request gitlab-org/gitlab-ce!29205
\| * \| \|	Explain how to contribute new vulnerabilities	Fabien Catteau	2019-06-05	1	-0/+6
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a link to the gemnasium-db and explain how to search for a vulnerability or contribute a new one. See https://gitlab.com/gitlab-org/gitlab-ee/issues/11169
* \| \|	Merge branch 'docs/clarify-group-page-icons' into 'master'	Achilleas Pipinellis	2019-06-05	1	-11/+17
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Be more specific about Groups page See merge request gitlab-org/gitlab-ce!29174
\| * \| \|	Be more specific about Groups page	Evan Read	2019-06-05	1	-11/+17
\|/ / /
* \| \|	Merge branch 'docs/edit-downstream-variables' into 'master'	Achilleas Pipinellis	2019-06-05	1	-5/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit downstream variable content See merge request gitlab-org/gitlab-ce!28853
\| * \| \|	Edit downstream variable content	Evan Read	2019-06-05	1	-5/+6
\|/ / /
* \| \|	Merge branch 'jv-gitaly-rspec-catfile' into 'master'	Stan Hu	2019-06-05	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitaly rspec failures 'too many open files' Closes gitaly#1711 See merge request gitlab-org/gitlab-ce!29203
\| * \| \|	Fix gitaly rspec failures 'too many open files'	Jacob Vosmaer	2019-06-05	1	-0/+1
\|/ / /
* \| \|	Merge branch 'issue/54169' into 'master'	Annabel Dunstone Gray	2019-06-05	2	-14/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added new styling to the `.flash-warning` styles and moved the bundled style... See merge request gitlab-org/gitlab-ce!28916
\| * \| \|	added new styling to the `.flash-warning` styles and moved the bundled style ↵	Michel Engelen	2019-06-05	2	-14/+20
\|/ / / \| \| \| \| \| \| \| \| \|	definitions up to allow overrides for specific flash-types
* \| \|	Merge branch 'issue_49897' into 'master'	Robert Speicher	2019-06-05	9	-31/+91
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete unauthorized Todos when project is private Closes #49897 See merge request gitlab-org/gitlab-ce!28560
\| * \| \|	Delete unauthorized Todos when project is privateissue_49897	Felipe Artur	2019-06-05	9	-31/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete Todos for guest users when project visibility level is updated to private.
* \| \| \|	Merge branch '11204-turn-off-mask-by-default' into 'master'	Mike Greiling	2019-06-05	7	-18/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default masked to false for new variables Closes gitlab-ee#11204 See merge request gitlab-org/gitlab-ce!28186
\| * \| \| \|	Default masked to false for new variables11204-turn-off-mask-by-default	mfluharty	2019-06-04	7	-18/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the default value to false Adjust tests to expect false as the default Update documentation to make new default clear
* \| \| \| \|	Merge branch 'qa-allow-review-jobs-to-fail' into 'master'	Rémy Coutable	2019-06-05	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow the review-deploy and review-qa-* jobs to fail for now See merge request gitlab-org/gitlab-ce!29208
\| * \| \| \| \|	Allow the review-deploy and review-qa-* jobs to fail for now	Rémy Coutable	2019-06-05	1	-2/+2
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'vzagorodny-fix-broken-link-insights-default-config-ce' into ↵	Mike Lewis	2019-06-05	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [CE backport] Fix broken link to default insights config in docs See merge request gitlab-org/gitlab-ce!29190
\| * \| \| \| \|	[CE backport] Fix broken link to default insights config in docs	Victor Zagorodny	2019-06-05	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch '10403-harden-against-gitlab-assets-compile-transient-failures' ↵	Stan Hu	2019-06-05	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Harden gitlab:assets:compile against transient network failures Closes gitlab-ee#10403 See merge request gitlab-org/gitlab-ce!29211
\| * \| \| \| \|	Harden gitlab:assets:compile against transient network failures	Nick Thomas	2019-06-05	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '60819_yamllint_gitlabci' into 'master'	Rémy Coutable	2019-06-05	54	-348/+372
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	60819 yamllint gitlabci See merge request gitlab-org/gitlab-ce!29124
\| * \| \| \| \| \|	Add yaml lint	Kamil Trzciński	2019-06-05	54	-348/+372
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds CI job that validates all `*.yml` with `yamllint`. This commit fixes all offenses present in repository.
* \| \| \| \| \|	Merge branch '54140-non-ar-cache-commit-markdown' into 'master'	Douwe Maan	2019-06-05	21	-406/+758
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
\| * \| \| \| \| \|	Cleanup #attributes method54140-non-ar-cache-commit-markdown	Patrick Bajao	2019-06-05	1	-20/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we're prepending the ActiveRecord::Extension module, we can take advantage of it and avoid using an alias to extend the original #attributes method.
\| * \| \| \| \| \|	Use markdown_field helper to display full_title	Patrick Bajao	2019-06-05	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove requirement for id for #markdown_cache_key	Patrick Bajao	2019-06-05	4	-14/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's not needed anymore as we require `#cache_key` instead.
\| * \| \| \| \| \|	Use #cache_key of subject for generated redis key	Patrick Bajao	2019-06-05	5	-28/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit also includes some changes in specs to use `Class.new` approach.
\| * \| \| \| \| \|	Use Redis for CacheMarkDownField on non AR models	Patrick Bajao	2019-06-05	20	-405/+760
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows using `CacheMarkdownField` for models that are not backed by ActiveRecord. When the including class inherits `ActiveRecord::Base` we include `Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the markdown fields to be rendered and the generated HTML stored in a `<field>_html` attribute on the record. We also store the version used for generating the markdown. All other classes that include this model will include the `Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html` attributes to that model and will generate the html in them. The generated HTML will be cached in redis under the key `markdown_cache:<class>:<id>`. The class this included in must therefore respond to `id`.
* \| \| \| \| \| \|	Merge branch 'snowplow-attrs-helper' into 'master'	Mayra Cabrera	2019-06-05	3	-11/+28
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add snowplow haml attr helper See merge request gitlab-org/gitlab-ce!28724
\| * \| \| \| \| \| \|	Add snowplow haml attr helper	Luke Bennett	2019-06-05	3	-11/+28
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Helps build a hash of snowplow tracking data attrs. Updates import project pane to use new helper.