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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use valid data in our GetCommit example responsedocs/zj-patch-json	Zeger-Jan van de Weg	2019-03-29	1	-2/+2
\| \| \| \|	When validating parsing, copy pasting should just work, but instead we created
*	Merge branch '59462-applicatonsettings-not-tolerant-of-missing-db-columns' ↵	Stan Hu	2019-03-29	2	-4/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use a Gitlab::FakeApplicationSettings when migrations are pending Closes #59462 See merge request gitlab-org/gitlab-ce!26601
\| *	Apply suggestion to spec/lib/gitlab/current_settings_spec.rb59462-applicatonsettings-not-tolerant-of-missing-db-columns	Lin Jen-Shin	2019-03-28	1	-1/+1
\| \|
\| *	Use a Gitlab::FakeApplicationSettings when migrations are pending	Rémy Coutable	2019-03-26	2	-3/+12
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'ce-1607-elastic_feature_flag_per_group' into 'master'	Nick Thomas	2019-03-29	5	-2/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport of 1607-elastic_feature_flag_per_group See merge request gitlab-org/gitlab-ce!25825
\| * \|	Backport of 1607-elastic_feature_flag_per_groupce-1607-elastic_feature_flag_per_group	Mario de la Ossa	2019-03-28	5	-2/+4
\| \| \|
* \| \|	Merge branch 'winh-jest-vue-tips' into 'master'	Tim Zallmann	2019-03-29	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable Vue tips when running Jest See merge request gitlab-org/gitlab-ce!26717
\| * \| \|	Disable Vue tips when running Jestwinh-jest-vue-tips	Winnie Hellmann	2019-03-28	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master'	Kamil Trzciński	2019-03-29	21	-31/+354
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use merge request HEAD ref for detached merge request pipelines Closes #58454 See merge request gitlab-org/gitlab-ce!25504
\| * \| \| \|	Create detached merge request pipelinespersist-fulll-ref-path-for-mr-pipelines	Shinya Maeda	2019-03-29	21	-31/+354
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By using `refs/merge-requests/:iid/head` ok ok Improve naming nicely Add nice tests add nice tests fix some more revert
* \| \| \| \|	Merge branch 'refactor/ce_stubbed_worker' into 'master'	Douwe Maan	2019-03-29	7	-76/+49
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor subbed_worker calls Closes #58484 See merge request gitlab-org/gitlab-ce!26708
\| * \| \| \| \|	Refactor subbed_worker callsrefactor/ce_stubbed_worker	João Cunha	2019-03-28	7	-76/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Creates a support/helper file and moves all the duplication defs into it
* \| \| \| \| \|	Merge branch 'sh-fix-gitaly-find-commit-caching' into 'master'	Kamil Trzciński	2019-03-29	8	-14/+70
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow ref name caching CommitService#find_commit Closes #57083 See merge request gitlab-org/gitlab-ce!26248
\| * \| \| \| \| \|	Guard against nested allows with ref name cachingsh-fix-gitaly-find-commit-caching	Stan Hu	2019-03-27	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids the case: ``` allow_ref_name_caching do allow_ref_name_caching do # using-feature end end ```
\| * \| \| \| \| \|	Allow ref name caching CommitService#find_commit	Stan Hu	2019-03-27	8	-14/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For a given merge request, it's quite common to see duplicate FindCommit Gitaly requests because the Gitaly CommitService caches the request by the commit SHA, not by the ref name. However, most of the duplicate requests use the ref name, so the cache is never actually used in practice. This leads to unnecessary requests that slow performance. This commit allows certain callers to bypass the ref name to OID conversion in the cache. We don't do this by default because it's possible the tip of the branch changes during the commit, which would cause the caller to get stale data. This commit also forces the Ci::Pipeline to use the full ref name so that caching can work for merge requests. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57083
* \| \| \| \| \| \|	Merge branch 'add-pluck-primary-key' into 'master'	Robert Speicher	2019-03-29	154	-164/+169
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a thin encapsulation around .pluck(:id) See merge request gitlab-org/gitlab-ce!26669
\| * \| \| \| \| \| \|	Add a thin encapsulation around .pluck(:id)	Nick Thomas	2019-03-28	5	-14/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Inherit from ApplicationRecord instead of ActiveRecord::Base	Nick Thomas	2019-03-28	149	-150/+150
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-jest-gon' into 'master'	Filipa Lacerda	2019-03-29	5	-6/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set gon.ee in Jest Closes #59634 See merge request gitlab-org/gitlab-ce!26713
\| * \| \| \| \| \| \| \|	Set gon.ee in Jestwinh-jest-gon	Winnie Hellmann	2019-03-28	2	-9/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Ignore Jest config from ESLint	Winnie Hellmann	2019-03-28	2	-1/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Extract IS_EE config helper	Winnie Hellmann	2019-03-28	2	-5/+10
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '10735-geo-gitlab-revision-can-return-not-consistent-results' ↵	Sean McGivern	2019-03-29	3	-2/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use a fixed git abbrev parameter when we fetch a git revision See merge request gitlab-org/gitlab-ce!26707
\| * \| \| \| \| \| \| \|	Use a fixed git abbrev parameter when we fetch a git revision10735-geo-gitlab-revision-can-return-not-consistent-results	Valery Sizov	2019-03-28	3	-2/+7
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'leipert-port-scsslint' into 'master'	Filipa Lacerda	2019-03-29	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport scss-lint config from EE See merge request gitlab-org/gitlab-ce!26711
\| * \| \| \| \| \| \| \|	Backport scss-lint config from EE	Lukas Eipert	2019-03-28	1	-1/+3
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '10085-resovle-ee-diff' into 'master'	Filipa Lacerda	2019-03-29	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds EE validators to CE file See merge request gitlab-org/gitlab-ce!26736
\| * \| \| \| \| \| \| \|	Adds EE validators to CE file	Sarah Groff Hennigh-Palermo	2019-03-29	1	-0/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'winh-jest-helpers' into 'master'	Phil Hughes	2019-03-29	11	-0/+235
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy missing helpers from Karma to Jest See merge request gitlab-org/gitlab-ce!26729
\| * \| \| \| \| \| \| \|	Copy missing helpers from Karma to Jest	Winnie Hellmann	2019-03-28	11	-0/+235
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy missing helpers from Karma to Jest
* \| \| \| \| \| \| \|	Merge branch 'tr-add-requested-resource-metric-ce' into 'master'	Phil Hughes	2019-03-29	4	-6/+14
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add requested resources to cluster health - ce port See merge request gitlab-org/gitlab-ce!26326
\| * \| \| \| \| \| \|	Add requested resources to cluster health - ce port	Tristan Read	2019-03-29	4	-6/+14
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'patch-30' into 'master'	Evan Read	2019-03-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	README.md: fix URL to CI Lint See merge request gitlab-org/gitlab-ce!26580
\| * \| \| \| \| \| \|	README.md: fix URL to CI Lint	Damian Nowak	2019-03-26	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-ci-intro-illustration' into 'master'	Mike Lewis	2019-03-29	3	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update CI/CD intro - workflow illustration Closes #59108 See merge request gitlab-org/gitlab-ce!26733
\| * \| \| \| \| \| \| \|	Update ci workflow illustration	Marcia Ramos	2019-03-28	3	-1/+1
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '9420-truncate-long-tags' into 'master'	Mike Greiling	2019-03-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate long tags in runners table See merge request gitlab-org/gitlab-ce!26666
\| * \| \| \| \| \| \| \|	Truncate long tags in runners table	Sarah Groff Hennigh-Palermo	2019-03-28	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ce-reduce-diff-with-ce-in-spec-helpers' into 'master'	Lin Jen-Shin	2019-03-28	6	-7/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Reduce diff with EE in `spec/helpers` Closes gitlab-ee#10143 See merge request gitlab-org/gitlab-ce!26706
\| * \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/helpers/projects_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/helpers/merge_requests_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/helpers/issuables_helper_spec.rb	Rémy Coutable	2019-03-28	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/helpers/group_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/helpers/auth_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/helpers/appearances_helper_spec.rb	Rémy Coutable	2019-03-28	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'related-mr-link-cutoff' into 'master'docs-ci-variables-move-9-0-renaming	Annabel Dunstone Gray	2019-03-28	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't cutoff letters in MR and Issue links See merge request gitlab-org/gitlab-ce!25910
\| * \| \| \| \| \| \| \|	Don't cutoff letters in MR and Issue links	gfyoung	2019-03-28	2	-0/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'renovate/gitlab-svgs-1.x' into 'master'	Mike Greiling	2019-03-28	2	-5/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/svgs to ^1.55.0 See merge request gitlab-org/gitlab-ce!26664
\| * \| \| \| \| \| \|	Merge branch 'master' into 'renovate/gitlab-svgs-1.x'	Lukas 'Eipi' Eipert	2019-03-28	2	-5/+5
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # package.json
* \| \| \| \| \| \|	Merge branch '24936-remove-type-from-review-app-name' into 'master'	Mike Greiling	2019-03-28	2	-10/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant group name from environment name on the "Environments" page Closes #24936 See merge request gitlab-org/gitlab-ce!25600