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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix Container Scanning for Kubernetes Runnersfix-container-scanning-on-k8s	Philippe Lafoucrière	2019-03-31	3	-6/+23
\| \| \| \| \|	closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6636 closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5763
*	Merge branch 'sh-fix-failing-spec-on-first-da' into 'master'	James Lopez	2019-03-30	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing spec in spec/features/users/login_spec.rb Closes #59731 See merge request gitlab-org/gitlab-ce!26787
\| *	Fix failing spec in spec/features/users/login_spec.rb	Stan Hu	2019-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This spec would start to fail on the first of the month because the generated text would have a zero-padded day (e.g. 01 vs 1), whereas the expected text check used an unpadded day via the `-d` parameter in strftime (https://apidock.com/ruby/Date/strftime). To fix this, we use use the `d` parameter to pad zeros. This spec was introduced recently in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25731. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59731
* \|	Merge branch 'qa-ml-fix-push-file-size-test' into 'master'button-arrangement	Dan Davison	2019-03-29	1	-2/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Fix 2 of 3 problems with the push file size tests See merge request gitlab-org/gitlab-ce!26741
\| * \|	Fix push file size testqa-ml-fix-push-file-size-test	Mark Lapierre	2019-03-28	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to re-create master as a new branch. Expect a Git error raised when the file it too large.
* \| \|	Merge branch 'leipert-hotfix-ci-yml' into 'master'	Stan Hu	2019-03-29	1	-7/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitLab CI branch matching pattern See merge request gitlab-org/gitlab-ce!26777
\| * \| \|	Fix GitLab CI branch matching pattern	Lukas Eipert	2019-03-29	1	-7/+7
\| \| \| \|
* \| \| \|	Merge branch 'dennis-positioning-important' into 'master'	Clement Ho	2019-03-29	1	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Designate common positioning classes as `!important` a la Bootstrap See merge request gitlab-org/gitlab-ce!26621
\| * \| \| \|	Designate common positioning classes as important a la Bootstrapdennis-positioning-important	Dennis Tang	2019-03-26	1	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/zj-patch-json' into 'master'	Nick Thomas	2019-03-29	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use valid data in our GetCommit example response See merge request gitlab-org/gitlab-ce!26770
\| * \| \| \| \|	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 'rename-cluster-managed-method' into 'master'	Douglas Barbosa Alexandre	2019-03-29	12	-26/+137
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renames Cluster#managed? to provided_by_user? See merge request gitlab-org/gitlab-ce!26567
\| * \| \| \| \| \|	Renames Cluster#managed? to provided_by_user?	Mayra Cabrera	2019-03-29	12	-26/+137
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow to user the term managed? on https://gitlab.com/gitlab-org/gitlab-ce/issues/56557. Managed? will be used to distinct clusters that are automatically managed by GitLab
* \| \| \| \| \|	Merge branch 'update-contribution-closing-policy' into 'master'	Marcia Ramos	2019-03-29	1	-2/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update contribution closing policy See merge request gitlab-org/gitlab-ce!26728
\| * \| \| \| \|	Docs: Update contribution closing policy to include community attribution	Lucas Charles	2019-03-29	1	-2/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'winh-jest-html-fixtures' into 'master'	Clement Ho	2019-03-29	4	-10/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add helpers for HTML fixtures to Jest Closes #57998 See merge request gitlab-org/gitlab-ce!26739
\| * \| \| \| \| \|	Add Karma-style fixture helpers to Jestwinh-jest-html-fixtures	Winnie Hellmann	2019-03-29	3	-2/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add helpers for HTML fixtures to Jest	Winnie Hellmann	2019-03-29	1	-6/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add workaround for innerText in Jest	Winnie Hellmann	2019-03-29	1	-0/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move abuse_reports_spec.js to Jest	Winnie Hellmann	2019-03-29	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-ci-deprecated-variables' into 'master'	Mike Lewis	2019-03-29	2	-30/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: new doc for deprecated variables See merge request gitlab-org/gitlab-ce!26737
\| * \| \| \| \| \| \|	New doc - deprecated variablesdocs-ci-deprecated-variables	Marcia Ramos	2019-03-28	2	-30/+32
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'renovate/gitlab-svgs-1.x' into 'master'	Clement Ho	2019-03-29	2	-5/+5
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/svgs to ^1.57.0 See merge request gitlab-org/gitlab-ce!26758
\| * \| \| \| \| \| \|	Update dependency @gitlab/svgs to ^1.57.0	Lukas 'Eipi' Eipert	2019-03-29	2	-5/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '58971-sentry-api-keyerror' into 'master'57970-i18n-linters-eslint-js	Sean McGivern	2019-03-29	8	-31/+163
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle missing keys in sentry api response Closes #58971 See merge request gitlab-org/gitlab-ce!26264
\| * \| \| \| \| \| \|	Handle missing keys in sentry api response	Reuben Pereira	2019-03-29	8	-31/+163
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Do not raise error when there are missing non-essential keys in sentry api response. - Add specs for to check for missing keys behavior.
* \| \| \| \| \| \|	Merge branch '50199-quick-actions-refactor' into 'master'	Sean McGivern	2019-03-29	50	-1069/+3128
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend quick actions dsl Closes #50199 See merge request gitlab-org/gitlab-ce!26095
\| * \| \| \| \| \| \|	Extend quick actions dsl50199-quick-actions-refactor	Alexandru Croitor	2019-03-29	50	-1069/+3128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Extend quick actions dsl to allow specifying model types to which given quick action applies * Rename issuable attribute to noteable in interpret_service.rb * Refactor and reorder quick action specs * Create a shared example spec for each quick action to be used for issue, merge request and commit specs. https://gitlab.com/gitlab-org/gitlab-ce/issues/50199
* \| \| \| \| \| \| \|	Merge branch '59569-some-steps-are-missed-during-review-apps-deployments' ↵	Robert Speicher	2019-03-29	1	-125/+161
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add more logging to the Review Apps deployment steps See merge request gitlab-org/gitlab-ce!26645
\| * \| \| \| \| \| \|	Add more logging in the Review Apps deployment steps59569-some-steps-are-missed-during-review-apps-deployments	Rémy Coutable	2019-03-28	1	-125/+161
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \|