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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve & clean up the PROCESS.md doc	Rémy Coutable	2018-12-17	1	-4/+5
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Removed rails 5 documentation	Jan Provaznik	2018-12-14	2	-28/+0
\| \| \| \| \|	Because we removed rails 4 support, this document is not needed anymore.
*	Merge branch 'doc-prettier-vscode-settings' into 'master'	Filipa Lacerda	2018-12-14	1	-0/+35
\|\ \| \| \| \| \| \| \| \|	Update prettier.md with VSCode Settings section See merge request gitlab-org/gitlab-ce!23810
\| *	Update prettier.md with VSCode Settings section	Paul Slaughter	2018-12-14	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Why? This is a recurring issue that new team members keep running into.
* \|	Add dplanella as Catalan proofreader	David Planella	2018-12-14	1	-1/+1
\| \|
* \|	Fix documentation for automatic merging	Yorick Peterse	2018-12-13	1	-11/+13
\| \| \| \| \| \| \| \| \| \|	The strategy name and interval was incorrect, and the link back to the developer documentation was in the wrong place.
* \|	Update best_practices.md	Sam Bigelow	2018-12-12	1	-3/+3
\| \|
* \|	Document how to run rspec tests	Sam Bigelow	2018-12-12	1	-0/+10
\|/
*	Fix ActiveRecord::Migration deprecations	Yorick Peterse	2018-12-12	5	-20/+20
\| \| \| \| \|	Extending from ActiveRecord::Migration is deprecated, but was still used in a bunch of places.
*	Merge branch 'docs/update-automatic-merge-documentation' into 'master'	Marcia Ramos	2018-12-12	1	-83/+177
\|\ \| \| \| \| \| \| \| \|	Update automatic merging documentation See merge request gitlab-org/gitlab-ce!23689
\| *	Update automatic merging documentation	Yorick Peterse	2018-12-11	1	-83/+177
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're moving from merging + reverting to only merging with the `ours` strategy, removing the need for merge requests or reverting conflicts. For more details, refer to Merge Train merge request https://gitlab.com/gitlab-org/merge-train/merge_requests/6.
* \|	Merge branch 'patch-35' into 'master'	Marcia Ramos	2018-12-12	1	-1/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Add spaces before code snippets in vuex.md See merge request gitlab-org/gitlab-ce!23737
\| * \|	Add spaces before code snippets	Sylhare	2018-12-11	1	-1/+5
\| \| \|
* \| \|	Fix links to sections that were moved	Michael Kozono	2018-12-11	1	-2/+2
\|/ /
* \|	Docs: how the global nav works	Marcia Ramos	2018-12-11	3	-3/+411
\|/
*	Merge branch 'docs/run-help-pages-tests' into 'master'	Achilleas Pipinellis	2018-12-07	1	-0/+11
\|\ \| \| \| \| \| \| \| \|	Document `/help` tests See merge request gitlab-org/gitlab-ce!23469
\| *	Provide information on /help rspec tests	Evan Read	2018-12-07	1	-0/+11
\| \|
* \|	Merge branch 'docs-feature-flag-dev' into 'master'	Douwe Maan	2018-12-07	1	-1/+9
\|\ \ \| \|/ \|/\| \| \| \| \|	Add section about enabling feature flag in development See merge request gitlab-org/gitlab-ce!23634
\| *	Add section about enabling feature flag in development	Clement Ho	2018-12-06	1	-1/+9
\| \|
* \|	Merge branch '54610-allow-review-jobs-to-fail' into 'master'	Douglas Barbosa Alexandre	2018-12-06	1	-0/+35
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Retry the review-{deploy,qa} jobs twice, and allow them to fail Closes #54610 and #54717 See merge request gitlab-org/gitlab-ce!23510
\| *	Add an 'How-To' section to the Review Apps doc	Rémy Coutable	2018-12-06	1	-0/+35
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Remove mentions of Redash	Stan Hu	2018-12-05	2	-6/+5
\|/ \| \| \| \| \| \|	Related links: * https://gitlab.com/gitlab-com/Product/issues/5 * https://gitlab.com/meltano/looker/issues/294
*	Update proofreader.md	Maksymilian Roman	2018-12-05	1	-0/+1
\|
*	Update proofreader.md	Jeongwhan Choi	2018-12-05	1	-0/+1
\|
*	Merge branch 'winh-add-jest' into 'master'	Mike Greiling	2018-12-05	1	-0/+8
\|\ \| \| \| \| \| \| \| \|	Setup Jest test environment See merge request gitlab-org/gitlab-ce!23406
\| *	Setup Jest test environment	Winnie Hellmann	2018-12-05	1	-0/+8
\| \|
* \|	Merge branch 'merge-train' into 'master'	Rémy Coutable	2018-12-04	1	-177/+106
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Automatically merge CE master into EE master See merge request gitlab-org/gitlab-ce!23453
\| * \|	Updated documentation of CE to EE merges	Yorick Peterse	2018-12-04	1	-177/+106
\| \|/ \| \| \| \| \| \| \| \|	This updates the documentation of automatic CE to EE merges to cover the new automatic merging setup.
* \|	Merge branch 'master' into 'patch-28'	Rémy Coutable	2018-12-04	80	-2563/+2796
\|\ \ \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/development/i18n/proofreader.md
\| * \|	Make docs about expect_next_instance_of consistent	Lin Jen-Shin	2018-12-03	1	-3/+3
\| \|/ \| \| \| \| \| \| \| \| \| \|	So we compare `expect_any_instance_of` with `expect_next_instance_of`, but still mention `allow_any_instance_of`.
\| *	Merge branch 'patch-31' into 'master'	Achilleas Pipinellis	2018-12-03	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update architecture.md See merge request gitlab-org/gitlab-ce!23430
\| \| *	Update architecture.md	B1nj0y	2018-11-29	1	-1/+1
\| \| \|
\| * \|	Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'	Nick Thomas	2018-11-30	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API::Namespaces routing to accept namepaces with dots See merge request gitlab-org/gitlab-ce!22912
\| \| * \|	Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routing	Imre Farkas	2018-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS
\| * \| \|	Fix Red/Orange data link markdown	Philippe Lafoucrière	2018-11-30	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch ↵	Rémy Coutable	2018-11-29	1	-0/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'docs/8608-update-approval-guidelines-to-include-red-orange-data-reviews' into 'master' Add RED data security requirement to code review See merge request gitlab-org/gitlab-ce!23426
\| \| * \| \|	Add RED data security requirement to code review	Philippe Lafoucrière	2018-11-28	1	-0/+2
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	closes #8608
\| * \| \|	Merge branch 'mk/author-preparation-docs' into 'master'	Marcia Ramos	2018-11-29	1	-0/+17
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encourage MR author preparation in Code Review Guidelines documentation See merge request gitlab-org/gitlab-ce!23360
\| \| * \| \|	Encourage MR author preparation	Michael Kozono	2018-11-28	1	-0/+17
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fe-apollo-docs' into 'master'	Filipa Lacerda	2018-11-29	2	-0/+86
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Added frontend GraphQL docs See merge request gitlab-org/gitlab-ce!23405
\| \| * \| \|	Added frontend GraphQL docs	Phil Hughes	2018-11-28	2	-0/+86
\| \| \|/ /
\| * \| \|	Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'	Douwe Maan	2018-11-28	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes all the irrelevant code and columns that were migrated from the Project… See merge request gitlab-org/gitlab-ce!21497
\| \| * \| \|	Removes all the irrelevant import related code and columns	Tiago Botelho	2018-11-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clears the import related columns and code from the Project model over to the ProjectImportState model
\| * \| \| \|	Left shift security in our workflow	Philippe Lafoucrière	2018-11-28	1	-12/+37
\| \| \| \| \|
\| * \| \| \|	Merge branch '49570-add-review_qa-job' into 'master'	Sean McGivern	2018-11-28	1	-35/+49
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an automatic job to run QA smoke tests against Review Apps Closes #49570 See merge request gitlab-org/gitlab-ce!22853
\| \| * \| \| \|	Add a manual job to run QA against a Review App49570-add-review_qa-job	Rémy Coutable	2018-11-26	1	-35/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Renames review to review-deploy. 2. Renames stop_review to review-stop. 3. Adds a build-qa-image job to the prepare stage and save the QA Docker image as artifact (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120967019). 4. Adds a manual review-qa job to the test stage to run QA tests against the Review App (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120967238). 5. Make the review-deploy job plays the review-qa job as soon as the Review App is deployed (example: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/120988775). 6. Updates the Review Apps documentation accordingly. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Merge branch 'more-guidelines-on-when-to-squash' into 'master'	Dmitriy Zaporozhets	2018-11-28	1	-0/+3
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clearer docs when it is OK for maintainer to squash See merge request gitlab-org/gitlab-ce!23376
\| \| * \| \| \|	Clearer docs when it is OK for maintainer to squash	Dylan Griffith	2018-11-27	1	-0/+3
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'json-logging-for-k8s' into 'master'	Stan Hu	2018-11-27	1	-5/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Json logging for k8s Integration See merge request gitlab-org/gitlab-ce!23328
\| \| * \| \| \|	Correct errors in doc/development/logging.md	Dylan Griffith	2018-11-23	1	-5/+5
\| \| \| \|/ / \| \| \|/\| \|