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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Disable Vue tips when running Jestwinh-jest-vue-tips	Winnie Hellmann	2019-03-28	1	-0/+3
\|
*	Merge branch 'id-get-blobs-performance' into 'master'	Douwe Maan	2019-03-28	1	-2/+6
\|\ \| \| \| \| \| \| \| \|	Memoize old_blob and new_blob to improve performance See merge request gitlab-org/gitlab-ce!26604
\| *	Memoize old_blob and new_blob to improve performance	Igor	2019-03-28	1	-2/+6
\|/
*	Merge branch 'docs-document-qa-specific-branch-naming' into 'master'	Rémy Coutable	2019-03-28	1	-0/+18
\|\ \| \| \| \| \| \| \| \|	Document the branch naming conventions for QA-only changes See merge request gitlab-org/gitlab-ce!26704
\| *	Document the branch naming conventions for QA-only changes	Rémy Coutable	2019-03-28	1	-0/+18
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'remove-cng-job' into 'master'	Robert Speicher	2019-03-28	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove cloud-native-job from CI See merge request gitlab-org/gitlab-ce!25605
\| * \|	Make cloud release job manual, as a fallback	Balasankar "Balu" C	2019-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* \| \|	Merge branch 'knative-update' into 'master'	Grzegorz Bizon	2019-03-28	3	-3/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Knative version bump 0.2.2 -> 0.3.0 See merge request gitlab-org/gitlab-ce!26459
\| * \| \|	Knative version bump 0.2.2 -> 0.3.0	Chris Baumbauer	2019-03-28	3	-3/+8
\|/ / /
* \| \|	Merge branch ↵	Phil Hughes	2019-03-28	3	-13/+62
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9957-move-ee-differences-for-app-assets-javascripts-monitoring-components-dashboard-vue-ce' into 'master' Remove EE differences for monitoring dashboard See merge request gitlab-org/gitlab-ce!26574
\| * \| \|	Remove EE differences for monitoring dashboard	Simon Knox	2019-03-27	3	-13/+62
\| \| \| \|
* \| \| \|	Merge branch '59079-fix-jupyter-render-loop' into 'master'	Phil Hughes	2019-03-28	2	-14/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix jupyter rendering bug that ended in an infinite loop Closes #59079 See merge request gitlab-org/gitlab-ce!26667
\| * \| \| \|	Fix jupyter rendering bug that ended in an infinite loop	ROSPARS Benoit	2019-03-27	2	-14/+20
\| \| \| \| \|
* \| \| \| \|	Merge branch '10518-boards-css' into 'master'	Phil Hughes	2019-03-28	1	-1/+16
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for boards.scss Closes gitlab-ee#10518 See merge request gitlab-org/gitlab-ce!26647
\| * \| \| \|	Removes EE differences for boards.scss	Filipa Lacerda	2019-03-27	1	-1/+16
\| \|/ / /
* \| \| \|	Merge branch 'docs/review-MR-25586' into 'master'	Achilleas Pipinellis	2019-03-28	2	-19/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs review for MR 25586 Closes #59262 See merge request gitlab-org/gitlab-ce!26632
\| * \| \| \|	Docs review for MR 25586	Evan Read	2019-03-28	2	-19/+16
\|/ / / /
* \| \| \|	Merge branch 'zm-test-plan-refs' into 'master'	Achilleas Pipinellis	2019-03-28	2	-1/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update testing guide to reference test design See merge request gitlab-org/gitlab-ce!26619
\| * \| \| \|	Update testing guide to reference test design	Zeff Morgan	2019-03-26	2	-1/+16
\| \| \| \| \|
* \| \| \| \|	Merge branch '54670-external-diffs-when-outdated' into 'master'	Sean McGivern	2019-03-28	17	-24/+563
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow external diffs to be used conditionally Closes #54670 See merge request gitlab-org/gitlab-ce!25432
\| * \| \| \| \|	Allow external diffs to be used conditionally	Nick Thomas	2019-03-27	17	-24/+563
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since external diffs are likely to be a bit slower than in-database ones, add a mode that makes diffs external after they've been obsoleted by events. This should strike a balance between performance and disk space. A background cron drives the majority of migrations, since diffs become outdated through user actions.
* \| \| \| \| \|	Merge branch '59273-update-fugit' into 'master'	Grzegorz Bizon	2019-03-28	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update fugit which fixes a potential infinite loop Closes #59273 See merge request gitlab-org/gitlab-ce!26579
\| * \| \| \| \| \|	Update fugit which fixes a potential infinite loop	Lin Jen-Shin	2019-03-26	2	-1/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '59062-update-gitlab-markup-python-3' into 'master'	Sean McGivern	2019-03-28	7	-3/+130
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-markup to 1.7.0 and document Python3 requirements Closes #59062 See merge request gitlab-org/gitlab-ce!26246
\| * \| \| \| \| \| \|	Upgrade `gitlab-markup` to 1.7.0	Gabriel Mazetto	2019-03-27	7	-3/+130
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new version requires `python3` to be available. In omnibus installation this is already a reality as we are currently pathing previous `gitlab-markup` version to use `python3` instead of `python2`. We are now requiring `python3` with the gem without having to patch it. As a consequence to also make it easy to use it in development, we've introduced a `Pipfile` and `Pipfile.lock`, working similarly to `Gemfile` and `Gemfile.lock`, and added documentation on how to use them.
* \| \| \| \| \| \|	Merge branch 'fix-routes-n-plus-one-in-user-autocomplete' into 'master'	Grzegorz Bizon	2019-03-28	5	-18/+84
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N+1 queries from users autocomplete See merge request gitlab-org/gitlab-ce!26491
\| * \| \| \| \| \| \|	Remove N+1 queries from users autocomplete	Sean McGivern	2019-03-25	5	-18/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Both of these were related to groups: 1. We need to preload routes (using the `with_route` scope) if we're going to get the group's path. 2. We were counting each group's members separately. They're in the same commit because the spec for N+1 detection wouldn't pass with only one of these fixes.
* \| \| \| \| \| \| \|	Merge branch '59546-fix-error-handling-for-missing-domain' into 'master'	Sean McGivern	2019-03-28	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Auto DevOps missing domain error handling Closes #59546 See merge request gitlab-org/gitlab-ce!26627
\| * \| \| \| \| \| \| \|	Fix Auto DevOps missing domain error handling	Dylan Griffith	2019-03-28	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For some reason this value can be an empty string and we want to ensure that we correctly fail the job before a deploy. This is particularly problematic at the moment when coupled with https://gitlab.com/gitlab-org/gitlab-ce/issues/54760 as the user has no easy way to recover without destroying the cluster and starting over.
* \| \| \| \| \| \| \| \|	Merge branch 'qa-allow-gitlab-qa-pat-env-var' into 'master'	Rémy Coutable	2019-03-28	5	-11/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow personal access token env var from gitlab-qa See merge request gitlab-org/gitlab-ce!24048
\| * \| \| \| \| \| \| \| \|	Allow token env var from gitlab-qa	Mark Lapierre	2019-03-28	5	-11/+11
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-qa accepts an env var named GITLAB_QA_ACCESS_TOKEN, but here we only accepted PERSONAL_ACCESS_TOKEN. This change replaces PERSONAL_ACCESS_TOKEN with GITLAB_QA_ACCESS_TOKEN
* \| \| \| \| \| \| \| \|	Merge branch 'rubocop-handle-ee-migration-specs' into 'master'	Rémy Coutable	2019-03-28	2	-1/+19
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly handle `ee` migration specs See merge request gitlab-org/gitlab-ce!26685
\| * \| \| \| \| \| \| \| \|	Properly handle `ee` migration specs	Heinrich Lee Yu	2019-03-28	2	-1/+19
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-reduce-ee-diff-in-spec-policies' into 'master'	Lin Jen-Shin	2019-03-28	10	-447/+432
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Reduce diff with EE in `spec/policies` See merge request gitlab-org/gitlab-ce!26593
\| * \| \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/policies/group_policy_spec.rb	Rémy Coutable	2019-03-27	2	-49/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Factorize policy helpers into PolicyHelpers	Rémy Coutable	2019-03-27	6	-32/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/policies/project_policy_spec.rb	Rémy Coutable	2019-03-27	4	-373/+379
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	[CE] Reduce the diff with EE in spec/policies/namespace_policy_spec.rb	Rémy Coutable	2019-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-43' into 'master'	Evan Read	2019-03-28	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update U2F recommendations, fix #57656 Closes #57656 See merge request gitlab-org/gitlab-ce!25709
\| * \| \| \| \| \| \| \| \| \|	Update U2F recommendations, fix #57656	Mateusz Konieczny	2019-03-28	1	-3/+4
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/build-to-job-webhooks' into 'master'	Evan Read	2019-03-28	1	-15/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename build to job in webhooks docs Closes #42254 and #28226 See merge request gitlab-org/gitlab-ce!26676
\| * \| \| \| \| \| \| \| \| \|	Rename build to job in webhooks docs	Achilleas Pipinellis	2019-03-27	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'revert-c624c61a' into 'master'	Clement Ho	2019-03-27	17	-195/+50
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '13784-validate-variables-for-masking' into 'master'" Closes gitlab-ee#10740 and gitlab-ee#10738 See merge request gitlab-org/gitlab-ce!26684
\| * \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '13784-validate-variables-for-masking' into 'master'"	Kamil Trzciński	2019-03-27	17	-195/+50
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !25476
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'tz-upgrade-vue-2019-03-11' into 'master'	Clement Ho	2019-03-27	9	-140/+122
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgraded Vue to 2.6.10 and also Vuex to 3.1.0 See merge request gitlab-org/gitlab-ce!25981
\| * \| \| \| \| \| \| \| \| \| \|	Upgraded Vue to 2.6.8	Tim Zallmann	2019-03-27	9	-140/+122
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade to latest Version
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-add-gitaly-duration-logs' into 'master'	Douglas Barbosa Alexandre	2019-03-27	5	-13/+35
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log Gitaly RPC duration to api_json.log and production_json.log See merge request gitlab-org/gitlab-ce!26652
\| * \| \| \| \| \| \| \| \| \| \|	Log Gitaly RPC duration to api_json.log and production_json.log	Stan Hu	2019-03-27	5	-13/+35
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to debug Gitaly performance issues in the field. This commit also makes the tracking of query time thread-safe via RequestStore.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '13784-validate-variables-for-masking' into 'master'	Kamil Trzciński	2019-03-27	17	-50/+195
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add control for masking variable values in runner logs Closes #13784 See merge request gitlab-org/gitlab-ce!25476
\| * \| \| \| \| \| \| \| \| \| \|	Scaffold UI elements for minimal version	Miranda Fluharty	2019-03-27	17	-50/+195
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a masked switch to variable rows Copy some behavior from the protected switch