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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update group project templates to premium/silverdocs-update-group-template-pricing-tier	Tristan Williams	2019-05-14	1	-1/+1
\|
*	Merge branch 'docs/mermaid-supported-by-docs-site' into 'master'	Achilleas Pipinellis	2019-05-14	2	-4/+9
\|\ \| \| \| \| \| \| \| \|	Use real mermaid for mermaid result See merge request gitlab-org/gitlab-ce!28300
\| *	Use real mermaid for mermaid result	Evan Read	2019-05-14	2	-4/+9
\|/
*	Merge branch 'docs-writing-e2e-tests' into 'master'	Mark Lapierre	2019-05-13	4	-3/+423
\|\ \| \| \| \| \| \| \| \|	First iteration of documentation for writing end-to-end tests See merge request gitlab-org/gitlab-ce!27603
\| *	This is the first iteration of documentation for the GitLab QA	Walmyr	2019-05-13	4	-3/+423
\|/ \| \| \| \| \|	framework that intends to make easier for every engineer to contribute with the end-to-end tests creation, edition, and improvements.
*	Merge branch 'docs/improve-installation-from-source' into 'master'	Evan Read	2019-05-13	1	-0/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improve installation from source Closes #47483, #61549, and #50937 See merge request gitlab-org/gitlab-ce!28201
\| *	Improve installation from source	Dmitriy Zaporozhets	2019-05-13	1	-0/+30
\|/ \| \| \| \| \| \| \| \|	* Add a solution for JavaScript heap out of memory error when compiling assets * Add note about postgres database config * Start gitaly before gitlab:setup as it won't work otherwise Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch ↵	Evan Read	2019-05-13	3	-0/+36
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9228-geo-how-to-reconcile-differences-with-geo-checksum-mismatches-docs' into 'master' Document how to reconcile differences with Geo checksum mismatches Closes gitlab-ee#9228 See merge request gitlab-org/gitlab-ce!28183
\| *	Document how to reconcile differences with Geo checksum mismatches	Douglas Barbosa Alexandre	2019-05-13	3	-0/+36
\|/
*	Merge branch 'ruby-parser-rb-2-6' into 'master'	Stan Hu	2019-05-13	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Update ruby_parser for ruby 2.6 See merge request gitlab-org/gitlab-ce!28295
\| *	Update ruby_parser for ruby 2.6ruby-parser-rb-2-6	Luke Bennett	2019-05-13	1	-2/+2
\| \|
* \|	Merge branch '61302-remove-ignore_column-ci_cd' into 'master'	Douglas Barbosa Alexandre	2019-05-13	1	-1/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove ignore_column ci_id" Closes #61302 See merge request gitlab-org/gitlab-ce!28234
\| * \|	Remove ignore_column from Project model61302-remove-ignore_column-ci_cd	Dmitriy Zaporozhets	2019-05-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'winh-frontend-tests-check-dependencies' into 'master'	Kushal Pandya	2019-05-13	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that dependencies are installed before running frontend tests See merge request gitlab-org/gitlab-ce!28236
\| * \| \|	Ensure that dependencies are installed before running frontend testswinh-frontend-tests-check-dependencies	Winnie Hellmann	2019-05-13	1	-0/+4
\| \| \| \|
* \| \| \|	Merge branch ↵	Kushal Pandya	2019-05-13	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-11542-remove-non-semantic-use-of-row-in-member-listing-controls' into 'master' CE backport: Remove non-semantic use of `.row` in member listing controls See merge request gitlab-org/gitlab-ce!28204
\| * \| \| \|	Remove non-semantic use of `.row` in member listing controlsce-11542-remove-non-semantic-use-of-row-in-member-listing-controls	Dennis Tang	2019-05-08	2	-1/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'support-string-piwik-website-ids' into 'master'	Phil Hughes	2019-05-13	1	-0/+5
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds changelog entry for Matomo string website ID support See merge request gitlab-org/gitlab-ce!28244
\| * \| \| \|	Adds changelog entry for Matomostring website ID support	CDuv	2019-05-10	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'qa-ml-fix-branches-test' into 'master'	Sanad Liaquat	2019-05-13	7	-33/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix E2E test - wait for branches to not be present See merge request gitlab-org/gitlab-ce!27805
\| * \| \| \| \|	Add branch_name qa selectorqa-ml-fix-branches-test	Mark Lapierre	2019-05-07	5	-16/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses the branch_name element to find a branch with a specific name, instead of using a dynamic CSS class that can't be validated by the sanity selector test
\| * \| \| \| \|	Check test result via an assertion	Mark Lapierre	2019-05-01	2	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As long as `has_no_branch?` is only called in an assertion it shouldn't matter if it could return false but still allow the test to continue. So we don't need the new wait method
\| * \| \| \| \|	Make max wait time a constant	Mark Lapierre	2019-05-01	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So it can be used elsewhere in the code
\| * \| \| \| \|	Wait for branches to not be present	Mark Lapierre	2019-04-29	2	-14/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When testing if branches are deleted, wait for the branch element to not be present. Do the same for both checks (second and third branches).
* \| \| \| \| \|	Merge branch 'bvl-fix-graphql-autoloading' into 'master'	Nick Thomas	2019-05-13	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eager load the GraphQL schema in specs Closes gitlab-ee#11497 See merge request gitlab-org/gitlab-ce!28246
\| * \| \| \| \| \|	Eager load the GraphQL schema in specs	Bob Van Landuyt	2019-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid counting on Rails eager loading the GraphQL types, but preload them before the specs. This would avoid loading the schema in 2 separate threads concurrently (1 inside the specs, 1 inside the test-server that will receive requests). Loading the schema in parallel like that could cause duplicate definition errors.
* \| \| \| \| \| \|	Merge branch 'explain-artifacts-server-configuration-docs' into 'master'	Nick Thomas	2019-05-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expain usage of `artifacts_server` in `gitlab.yml` See merge request gitlab-org/gitlab-ce!28230
\| * \| \| \| \| \| \|	Expain usage of `artifacts_server` in `gitlab.yml`explain-artifacts-server-configuration-docs	Krasimir Angelov	2019-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add comment to clarify intended usage of `artifacts_server`. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/49475.
* \| \| \| \| \| \| \|	Merge branch 'graphql-docs-fix' into 'master'	Phil Hughes	2019-05-13	1	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doc/development/fe_guide/graphql.md See merge request gitlab-org/gitlab-ce!28272
\| * \| \| \| \| \| \| \|	Update doc/development/fe_guide/graphql.md	Natalia Tepluhina	2019-05-13	1	-2/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs-update-salesforce-documentation' into 'master'	Evan Read	2019-05-12	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix wording error in salesforce section See merge request gitlab-org/gitlab-ce!28190
\| * \| \| \| \| \| \| \|	Docs: Fix wording error in salesforce section	Gosia Ksionek	2019-05-12	1	-4/+4
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'patch-31' into 'master'	Evan Read	2019-05-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typos in new_ci_build_permissions_model.md See merge request gitlab-org/gitlab-ce!28087
\| * \| \| \| \| \| \| \|	fix typos in new_ci_build_permissions_model.md	Ben Bodenmiller	2019-05-04	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'updateWebhooksIssueMR' into 'master'	Achilleas Pipinellis	2019-05-12	1	-4/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update webhooks examples of Issue and MR in documentation Closes #61187 See merge request gitlab-org/gitlab-ce!27897
\| * \| \| \| \| \| \| \| \|	update `updated_at`field too	Maneschi Romain	2019-05-12	1	-4/+16
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not my initial idea but when I write the issue I see this field is wrong
* \| \| \| \| \| \| \| \|	Merge branch 'docs-k8s-apps-architecture-overview' into 'master'	Achilleas Pipinellis	2019-05-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update K8S apps to checkmark See merge request gitlab-org/gitlab-ce!28259
\| * \| \| \| \| \| \| \| \|	Update K8S apps to checkmarkk8s-apps-architecture-overview	Matija Čupić	2019-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646	Stan Hu	2019-05-11	2	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add EE fixtures to SeedFu fixture paths See merge request gitlab-org/gitlab-ce!28241
\| * \| \| \| \| \| \| \| \| \|	Add EE fixtures to SeedFu pathinclude-ee-fixtures	Balasankar "Balu" C	2019-05-10	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-update-process-mem' into 'master'	Ash McKenzie	2019-05-11	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update get_process_mem to 0.2.3 See merge request gitlab-org/gitlab-ce!28248
\| * \| \| \| \| \| \| \| \| \|	Update get_process_mem to 0.2.3sh-update-process-mem	Stan Hu	2019-05-10	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This squelches a BigDecimal warning in Ruby 2.6: warning: BigDecimal.new is deprecated; use BigDecimal() method instead. https://github.com/schneems/get_process_mem/blob/master/CHANGELOG.md
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-frontend-test-waiting-docs' into 'master'	Mike Lewis	2019-05-10	1	-1/+182
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide alternatives to using setTimeout in frontend tests (docs) Closes #49612 See merge request gitlab-org/gitlab-ce!28207
\| * \| \| \| \| \| \| \| \| \| \|	Provide alternatives to using setTimeout in frontend testswinh-frontend-test-waiting-docs	Winnie Hellmann	2019-05-09	1	-1/+182
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-add-omnibus-secrets' into 'master'	Grzegorz Bizon	2019-05-10	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add warning about updating Omnibus is secrets are updated See merge request gitlab-org/gitlab-ce!28247
\| * \| \| \| \| \| \| \| \| \| \|	Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secrets	Stan Hu	2019-05-10	1	-0/+11
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Merge branch '61550-next-badge' into 'master'	Phil Hughes	2019-05-10	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes next badge being always visible Closes #61550 See merge request gitlab-org/gitlab-ce!28249
\| * \| \| \| \| \| \| \| \| \|	Fixes next badge being always visible61550-next-badge	Filipa Lacerda	2019-05-10	2	-1/+6
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'avoid-unrelated-errors-in-quarantined-specs' into 'master'	Lin Jen-Shin	2019-05-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unrelated errors when teardowning quanrantined specs See merge request gitlab-org/gitlab-ce!28240
\| * \| \| \| \| \| \| \| \| \|	Fix unrelated errors when teardowning quanrantined specsavoid-unrelated-errors-in-quarantined-specs	Rémy Coutable	2019-05-10	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we're skipping the example in a before hook, the @_subscribers instance variable that is normally set in the setup phase of the test by https://github.com/rails/rails-controller-testing/blob/21014e48be124dd8d0af250b79f682519d445015/lib/rails/controller/testing/template_assertions.rb#L21 isn't set but the teardown phase of the example still happens and tries to iterate over the array of subcribers: https://github.com/rails/rails-controller-testing/blob/21014e48be124dd8d0af250b79f682519d445015/lib/rails/controller/testing/template_assertions.rb#L54 Using an around hook allows the @_subscribers instance variable to be set. Signed-off-by: Rémy Coutable <remy@rymai.me>