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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Group SAML docs explain metadata configurationce-jej/unflag-group-saml-metadata	James Edwards-Jones	2019-05-24	1	-1/+9
\|
*	Merge branch 'bvl-add-corrilation-id-to-all-exception' into 'master'	Douglas Barbosa Alexandre	2019-05-14	3	-10/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add correlation id to all sentry errors Closes #61699 See merge request gitlab-org/gitlab-ce!28253
\| *	Add correlation id to all sentry errors	Bob Van Landuyt	2019-05-13	3	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this, we were only adding the correlation id to the "acceptable exceptions" which we handle in code. But we need to add it to the default raven context so the information would be available for uncaught exceptions.
* \|	Merge branch 'patch-56' into 'master'	Evan Read	2019-05-14	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo See merge request gitlab-org/gitlab-ce!28276
\| * \|	Fix typo	Nicholas Bishop	2019-05-14	1	-1/+1
\|/ /
* \|	Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-core	Stan Hu	2019-05-14	10	-7/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Optimise upload path calls See merge request gitlab-org/gitlab-ce!28264
\| * \|	Optimise upload path calls	Sean McGivern	2019-05-14	10	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	String#underscore isn't particularly slow, but it's possible for us to call it many times in a users autocomplete request, with mostly-static values ('User', 'Group', etc.). We can memoise this and save a surprising amount of time (around 10% of the total request time in some cases).
* \| \|	Merge branch 'fix-slow-preview-note-specs' into 'master'	Sean McGivern	2019-05-14	1	-6/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hiding of quick action prompt in specs See merge request gitlab-org/gitlab-ce!28285
\| * \| \|	Fix hiding of quick action prompt in specsfix-slow-preview-note-specs	Heinrich Lee Yu	2019-05-14	1	-6/+4
\| \| \| \|
* \| \| \|	Merge branch 'patch-58' into 'master'	Stan Hu	2019-05-14	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delete feature flag when disabling Rugged See merge request gitlab-org/gitlab-ce!28289
\| * \| \| \|	delete feature flag when disabling Rugged	Ben Bodenmiller	2019-05-13	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'single-codebase-favicon-specs-ce' into 'master'	Rémy Coutable	2019-05-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE Backport to CE of EE!12404 See merge request gitlab-org/gitlab-ce!28292
\| * \| \| \| \|	EE backport to CE of favicon_spec.rbsingle-codebase-favicon-specs-ce move-ee-favicon-spec-changes-to-ee	lmcandrew	2019-05-13	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-project-visibility-level-validation' into 'master'	Stan Hu	2019-05-14	3	-2/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project visibility level validation Closes #59379 See merge request gitlab-org/gitlab-ce!28305
\| * \| \| \| \| \|	Fix project visibility level validation	Peter Marko	2019-05-14	3	-2/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '55583-rename-method-conflicts' into 'master'	Jan Provaznik	2019-05-14	12	-46/+46
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename methods that conflict in Rails 5.2 Closes #55583 See merge request gitlab-org/gitlab-ce!28281
\| * \| \| \| \| \|	Rename methods that conflict in Rails 5.255583-rename-method-conflicts	Heinrich Lee Yu	2019-05-12	12	-46/+46
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds suffix to enum methods and changes `in_groups` to `of_groups`
* \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|