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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'mc/bug/old-codequality-template-autodevops' into 'master'63415-error-when-viewing-page-2-or-later-of-elasticsearch-search-results	Lin Jen-Shin	2019-06-18	2	-24/+12
\|\ \| \| \| \| \| \| \| \|	Use new Code Quality job definition in Auto DevOps See merge request gitlab-org/gitlab-ce!29475
\| *	Refactor Code Quality templates into single filemc/bug/old-codequality-template-autodevops	Matija Čupić	2019-06-14	2	-24/+12
\| \|
* \|	Merge branch '59257-find-new-branches-harder' into 'master'	Rémy Coutable	2019-06-18	3	-1/+46
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Look for new branches more carefully Closes #59257 See merge request gitlab-org/gitlab-ce!29761
\| * \|	Look for new branches more carefully	Nick Thomas	2019-06-18	3	-1/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In certain cases, GitLab can miss a PostReceive invocation the first time a branch is pushed. When this happens, the "branch created" hooks are not run, which means various features don't work until the branch is deleted and pushed again. This MR changes the `Git::BranchPushService` so it checks the cache of existing branches in addition to the `oldrev` reported for the branch. If the branch name isn't in the cache, chances are we haven't run the service yet (it's what refreshes the cache), so we can go ahead and run it, even through `oldrev` is set. If the cache has been cleared by some other means in the meantime, then we'll still fail to run the hooks when we should. Fixing that in the general case is a larger problem, and we'd need to devote significant engineering effort to it. There's a chance that we'll run the relevant hooks multiple times with this change, if there's a race between the branch being created, and the `PostReceive` worker being run multiple times, but this can already happen, since Sidekiq is "at-least-once" execution of jobs. So, this should be safe.
* \| \|	Merge branch 'chore/rename-variable-ce' into 'master'	Mike Greiling	2019-06-18	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename TOKEN_TYPES to USER_TOKEN_TYPES See merge request gitlab-org/gitlab-ce!29785
\| * \| \|	Rename TOKEN_TYPES to USER_TOKEN_TYPES	Arun Kumar Mohan	2019-06-18	2	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'issue_60515' into 'master'	Sean McGivern	2019-06-18	32	-2317/+381
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move some quick actions feature specs to unit tests Closes #60515 See merge request gitlab-org/gitlab-ce!28795
\| * \| \| \|	Move some quick actions feature specs to unit tests	Felipe Artur	2019-06-18	32	-2317/+381
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move some feature specs for issues/merge requests quick actions to unit tests. They are taking too long to run on the pipelines.
* \| \| \|	Merge branch 'backport-report_approver-migration-to-ce' into 'master'	Yorick Peterse	2019-06-18	2	-0/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport approval MR rules report_type migration to CE See merge request gitlab-org/gitlab-ce!29766
\| * \| \| \|	Backport approval MR rules report_type migration to CEbackport-report_approver-migration-to-ce	Lucas Charles	2019-06-17	2	-0/+14
\| \| \| \| \|
* \| \| \| \|	Merge branch '57918-encrypt-feature-flags-tokens' into 'master'	Kamil Trzciński	2019-06-18	6	-1/+106
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add migrations needed to encrypt feature flags client tokens See merge request gitlab-org/gitlab-ce!29320
\| * \| \| \| \|	Add migrations needed to encrypt feature flags client tokens57918-encrypt-feature-flags-tokens	Krasimir Angelov	2019-06-18	6	-1/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make plaintext token column not null, add new token_encrypted column and index on project_id & token_encrypted. Post deployment migration to encrypt existing tokens.
* \| \| \| \| \|	Merge branch 'zj-feature-flag-default-on-catfile-cache' into 'master'	Douwe Maan	2019-06-18	7	-39/+84
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature flag default on catfile cache Closes gitaly#1712 See merge request gitlab-org/gitlab-ce!29556
\| * \| \| \| \| \|	Turn on Cat-File cache by default	Zeger-Jan van de Weg	2019-06-18	6	-26/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The feature flag has been introduced an was turned off by default, now the it will default to be turned on. That change would still allow users to turn this feature off by leveraging the Rails console by running: `Feature.disable("gitaly_catfile-cache")` Another option is to manage the number of items the LRU cache will contain, by updating the `config.toml` for Gitaly. This would be the `catfile_cache_size`: https://gitlab.com/gitlab-org/gitaly/blob/0dcb5c579e63754f557aef91a4fa7a00e5b8b127/config.toml.example#L27 Closes: https://gitlab.com/gitlab-org/gitaly/issues/1712
\| * \| \| \| \| \|	Move Gitaly feature flag logic to Feature::Gitaly	Zeger-Jan van de Weg	2019-06-18	4	-32/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The GitalyClient held a lot of logic which was all very tightly coupled. In this instance the feature logic was extracted to make it do just a little less and create a bit more focus in the GitalyClient's responsibilies.
* \| \| \| \| \| \|	Merge branch 'docs/https-many-docs-links' into 'master'	Achilleas Pipinellis	2019-06-18	17	-28/+28
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Https many links in docs See merge request gitlab-org/gitlab-ce!29776
\| * \| \| \| \| \| \|	Https many links in docs	Evan Read	2019-06-18	17	-28/+28
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/update-list-items' into 'master'	Achilleas Pipinellis	2019-06-18	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update list items to conform to documentation style guide See merge request gitlab-org/gitlab-ce!29739
\| * \| \| \| \| \| \|	Update list items to conform to documentation style guide	Arun Kumar Mohan	2019-06-16	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dz-remove-deprecated-group-routes' into 'master'	Grzegorz Bizon	2019-06-18	3	-112/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated group routes See merge request gitlab-org/gitlab-ce!29351
\| * \| \| \| \| \| \| \|	Remove deprecated group routesdz-remove-deprecated-group-routes	Dmitriy Zaporozhets	2019-06-14	3	-112/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'gitaly-version-v1.47.0' into 'master'	Yorick Peterse	2019-06-18	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.47.0 See merge request gitlab-org/gitlab-ce!29789
\| * \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.47.0	GitalyBot	2019-06-18	2	-1/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '11449-qa-fixes-for-sast-ds-docs' into 'master'	Achilleas Pipinellis	2019-06-18	2	-8/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos, grammar and wording for SAST and DS report JSON docs See merge request gitlab-org/gitlab-ce!29744
\| * \| \| \| \| \| \| \| \|	Fix typos, grammar and wording for SAST and DS report JSON docs	Victor Zagorodny	2019-06-18	2	-8/+7
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '63231-wiki-nav' into 'master'	Phil Hughes	2019-06-18	4	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix header alignment on wiki and kubernetes pages Closes #63231 See merge request gitlab-org/gitlab-ce!29698
\| * \| \| \| \| \| \| \|	Fix header alignment on wiki and kubernetes pages63231-wiki-nav	Annabel Dunstone Gray	2019-06-14	4	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'move-all-configs-to-global' into 'master'	Grzegorz Bizon	2019-06-18	21	-316/+825
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce default: for gitlab-ci.yml Closes #62732 See merge request gitlab-org/gitlab-ce!24627
\| * \| \| \| \| \| \| \| \|	Introduce default: for gitlab-ci.yml	Kamil Trzciński	2019-06-18	21	-316/+825
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves all existing `image/services/before_script/variables` into `default:`. This allows us to easily add a default and top-level entries. `default`: is keep backward compatible: to be considered to be job if `default:script:` is specified. This behavior should be removed. All existing `image/services/before_script/variables` are properly handled in root context.
* \| \| \| \| \| \| \| \|	Merge branch 'asciidoctor-upgrade' into 'master'	Douwe Maan	2019-06-18	4	-13/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade asciidoctor version to 2.0.10 and change method names in html5_converter Closes #63304 See merge request gitlab-org/gitlab-ce!29741
\| * \| \| \| \| \| \| \| \|	Add author to changelog	raju249	2019-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'asciidoctor-upgrade' of https://gitlab.com/raju249/gitlab-ce ↵	raju249	2019-06-17	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into asciidoctor-upgrade
\| \| * \| \| \| \| \| \| \| \|	Remove extra white line	raju249	2019-06-17	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add changelog for the upgrade	raju249	2019-06-17	2	-1/+5
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Revert to old name as its not needed to change and keep same in both files	raju249	2019-06-17	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change asciidoc.rb to refer new backend name	raju249	2019-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use same backend name, and remove reduntant use of require	raju249	2019-06-17	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add gemfile lock file for new ascii doctor versions	raju249	2019-06-17	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Upgrade asciidoctor version to 2.0.10 and change menthod names in ↵	raju249	2019-06-17	2	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	html5_converter
* \| \| \| \| \| \| \| \| \|	Merge branch 'bootstrap-to-glui' into 'master'	Filipa Lacerda	2019-06-18	6	-47/+12
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import bootstrap styles from gitlab-ui See merge request gitlab-org/gitlab-ce!26165
\| * \| \| \| \| \| \| \| \|	Upgrade gitlab-ui 4.2.0	Enrique Alcantara	2019-06-17	2	-5/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Import bootstrap styles from gitlab-ui	Simon Knox	2019-06-17	4	-42/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab_ui.scss instead of all the bootstrap imports Allow the ../node_modules path from gitlab_ui.scss to resolve
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-perf-mr-with-many-commits' into 'master'	Ramya Authappan	2019-06-18	2	-58/+132
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add script for creating an MR with many commits See merge request gitlab-org/gitlab-ce!29762
\| * \| \| \| \| \| \| \| \| \|	Add script for MR with many commitsqa-perf-mr-with-many-commits	Sanad Liaquat	2019-06-18	2	-58/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also does a lot of cleanup and refactoring
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-review-reduce-repo-size' into 'master'	Nick Thomas	2019-06-18	1	-11/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fixes all the alert boxes in "reduce repo size" Closes #61472 See merge request gitlab-org/gitlab-ce!29680
\| * \| \| \| \| \| \| \| \| \| \|	Docs: Fixes all the alert boxes in "reduce repo size"	Marcia Ramos	2019-06-18	1	-11/+12
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '62760-unquarantine-spec' into 'master'	Lin Jen-Shin	2019-06-18	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix flaky time related failure in spec/models/ci/pipeline_schedule_spec.rb Closes #62760 See merge request gitlab-org/gitlab-ce!29778
\| * \| \| \| \| \| \| \| \| \| \|	Fix flaky time related spec62760-unquarantine-spec	Heinrich Lee Yu	2019-06-18	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removes test from quarantine
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '55902-disable-creation-of-non-rbac-kubernetes-clusters' into ↵	Phil Hughes	2019-06-18	4	-14/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove support for creating non-RBAC kubernetes clusters Closes #55902 See merge request gitlab-org/gitlab-ce!29614
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove support for creating non-RBAC kubernetes clusters	Hordur Freyr Yngvason	2019-06-18	4	-14/+8
\|/ / / / / / / / / / / /