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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Extract auto-devops configuration calculationsrefactor_auto_devops_enabled	James Fargher	2019-07-18	2	-19/+44
\|
*	Merge branch ↵	Evan Read	2019-07-18	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	'if-12036-move_external_authorization_service_api_management_to_ee-doc' into 'master' Doc for "Move external authorization service API management to EE" See merge request gitlab-org/gitlab-ce!30579
\| *	Doc for "Move external authorization service API management to EE"	Imre Farkas	2019-07-18	1	-2/+2
\|/
*	Merge branch 'docs-lists-cleanup-1' into 'master'	Evan Read	2019-07-18	13	-161/+161
\|\ \| \| \| \| \| \| \| \|	Fix unordered list spacing (part 1) See merge request gitlab-org/gitlab-ce!30794
\| *	Fix unordered list spacing	Marcel Amirault	2019-07-18	13	-161/+161
\|/ \| \| \| \|	Correct the spacing of unordered markdown lists in docs, to maintain standards of documentation.
*	Merge branch 'patch-72' into 'master'	Ray Paik	2019-07-18	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	typo See merge request gitlab-org/gitlab-ce!30860
\| *	typo	mtmail	2019-07-17	1	-1/+1
\| \|
* \|	Merge branch 'fj-refactor-web-ide-counter' into 'master'	Nick Thomas	2019-07-17	8	-76/+47
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor WebIdeCommitsCounter and RedisCounter See merge request gitlab-org/gitlab-ce!30850
\| * \|	Refactor RedisCounter and WebIdeCommitsCounter	Francisco Javier López	2019-07-17	8	-76/+47
\|/ / \| \| \| \| \| \| \| \|	This MR refactor RedisCounter and WebIdeCommitsCounter to be reused by other components.
* \|	Merge branch 'qa-review-knapsack-reports' into 'master'	Mark Lapierre	2019-07-17	4	-1/+120
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Generate single report file for review-qa-all parallel tests See merge request gitlab-org/gitlab-ce!28834
\| * \|	Generate parallel spec reportsqa-review-knapsack-reports	Desiree Chevalier	2019-07-17	4	-1/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates reports for parallel specs and collates them into a single HTML report and displays results on the merge request.
* \| \|	Merge branch 'jc-wrap-rugged-calls-with-disk-access' into 'master'	Stan Hu	2019-07-17	9	-22/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap rugged calls with access disk block See merge request gitlab-org/gitlab-ce!30592
\| * \| \|	Wrap rugged calls with access disk blockjc-wrap-rugged-calls-with-disk-access	John Cai	2019-07-16	9	-22/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whenever we use the rugged implementation, we are going straight to disk so we want to bypass the disk access check.
* \| \| \|	Merge branch 'winh-multiple-issueboards-core' into 'master'	Mike Greiling	2019-07-17	10	-4/+887
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move multiple issue boards frontend to core (CE-backport) See merge request gitlab-org/gitlab-ce!30503
\| * \| \| \|	Move boards switcher partial	Winnie Hellmann	2019-07-17	10	-4/+887
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit a82e4d57a6fbba840a8a944e372b80866a1e48cc)
* \| \| \|	Merge branch '50228-add-test-for-deploy-token-username' into 'master'	Mayra Cabrera	2019-07-17	1	-0/+64
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for when deploy token usernames are not unique See merge request gitlab-org/gitlab-ce!30629
\| * \| \| \|	Add tests for when deploy token usernames are not unique	Krasimir Angelov	2019-07-17	1	-0/+64
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure correct behaviour when deploy tokens have the same username or deploy token and user have the same username.
* \| \| \|	Merge branch 'fix-project-factory-pages-access-level-default' into 'master'	Stan Hu	2019-07-17	2	-3/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix factory default for pages_access_level See merge request gitlab-org/gitlab-ce!30862
\| * \| \| \|	Fix factory default for pages_access_level	Vladimir Shushlin	2019-07-17	2	-3/+5
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pages access level currently depends on project visibilty which is ignored by factory, this commit fixes that
* \| \| \|	Merge branch 'docs-quality-data-qa-selector' into 'master'	Dan Davison	2019-07-17	2	-26/+45
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation surrounding [data-qa-selector] See merge request gitlab-org/gitlab-ce!30690
\| * \| \| \|	Add documentation surrounding [data-qa-selector]	Dan Davison	2019-07-17	2	-26/+45
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation was lacking for the [data-qa-selector] method of defining methods vs .qa-selector method.
* \| \| \|	Merge branch 'rs-zz-metrics' into 'master'	Lin Jen-Shin	2019-07-17	1	-0/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add EE-only class instrumentation See merge request gitlab-org/gitlab-ce!30802
\| * \| \| \|	Add EE-only class instrumentationrs-zz-metrics	Robert Speicher	2019-07-16	1	-0/+31
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mh/net-mocks-2' into 'master'	Mike Greiling	2019-07-17	9	-14/+269
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mockify jquery and axios packages into `spec/frontend` Closes #60136 See merge request gitlab-org/gitlab-ce!29272
\| * \| \| \| \|	Mockify jquery and axios packages	Martin Hanzel	2019-07-17	9	-14/+269
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the block that fails tests on unmocked axios requests from test_setup to its own mock, and added a jQuery mock that fails tests if they use unmocked $.ajax().
* \| \| \| \|	Merge branch 'mh/mocks-doc-2' into 'master'	Mike Greiling	2019-07-17	1	-0/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs about auto-injected Jest mocks Closes #62899 See merge request gitlab-org/gitlab-ce!30791
\| * \| \| \| \|	Add docs about auto-injected Jest mocks	Martin Hanzel	2019-07-17	1	-0/+28
\|/ / / / /
* \| \| \| \|	Merge branch '9928ee-add-rule_type-to-approval-project-rules' into 'master'	Mayra Cabrera	2019-07-17	4	-0/+41
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add migration for adding rule_type to approval_project_rules See merge request gitlab-org/gitlab-ce!30575
\| * \| \| \|	Add rule_type to approval_project_rules	Lucas Charles	2019-07-17	4	-0/+41
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds migration to introduce non-regular rule_types to approval_project_rules
* \| \| \|	Merge branch 'issue-64645-asciidoctor-footnote-links' into 'master'	Nick Thomas	2019-07-17	3	-5/+83
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preserve footnote link ids Closes #64645 See merge request gitlab-org/gitlab-ce!30790
\| * \| \| \|	Preserve footnote link ids	Guillaume Grossetie	2019-07-17	3	-5/+83
\| \| \| \| \|
* \| \| \| \|	Merge branch 'danger-throughputs' into 'master'	Lin Jen-Shin	2019-07-17	1	-0/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Danger asks for throughput labels See merge request gitlab-org/gitlab-ce!30622
\| * \| \| \| \|	Danger asks for throughput labelsdanger-throughputs	Mark Fletcher	2019-07-11	1	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove_clusters_cte_feature_flag' into 'master'	Douglas Barbosa Alexandre	2019-07-17	2	-39/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes clusters_cte feature flag Closes #64259 See merge request gitlab-org/gitlab-ce!30827
\| * \| \| \| \| \|	Removes clusters_cte feature flagremove_clusters_cte_feature_flag	Thong Kuah	2019-07-17	2	-39/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has been enabled on production without issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64259
* \| \| \| \| \| \|	Merge branch '10009-boards-index' into 'master'	Phil Hughes	2019-07-17	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for modal issues board See merge request gitlab-org/gitlab-ce!30836
\| * \| \| \| \| \| \|	Removes EE differences for modal issues board10009-boards-index	Filipa Lacerda	2019-07-17	2	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '48771-label-picker-line-break-on-long-label-titles' into 'master'	Kushal Pandya	2019-07-17	4	-2/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Label picker: Line break on long label titles" Closes #48771 See merge request gitlab-org/gitlab-ce!30610
\| * \| \| \| \| \| \| \|	Resolve "Label picker: Line break on long label titles"	Ammar Alakkad	2019-07-17	4	-2/+12
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'id-submodule-url-graphql' into 'master'	Nick Thomas	2019-07-17	18	-43/+213
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce the number of Gitaly calls for submodules See merge request gitlab-org/gitlab-ce!30735
\| * \| \| \| \| \| \| \|	Added submodule links to Submodule type in GraphQL API	Igor	2019-07-17	18	-43/+213
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is part of migration of Folder View to Vue
* \| \| \| \| \| \| \|	Merge branch 'letsencrypt-documentation' into 'master'	Nick Thomas	2019-07-17	8	-6/+105
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for Let's Encrypt integration See merge request gitlab-org/gitlab-ce!30627
\| * \| \| \| \| \| \| \|	Add docs for Let's Encrypt integration	Vladimir Shushlin	2019-07-17	8	-6/+105
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add deprecation warning to old integration * Add user docs * Add admin docs
* \| \| \| \| \| \| \|	Merge branch 'fix-pages-access-level-defaults' into 'master'	Nick Thomas	2019-07-17	8	-2/+301
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pages access level defaults See merge request gitlab-org/gitlab-ce!30354
\| * \| \| \| \| \| \| \|	Fix wrong pages access level default	Vladimir Shushlin	2019-07-17	8	-2/+301
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Set access level in before_validation hook - Add post migration for updating existing project_features
* \| \| \| \| \| \| \|	Merge branch 'if-64315-mget_sessions_in_chunks' into 'master'	Thong Kuah	2019-07-17	3	-4/+26
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do Redis lookup in batches in ActiveSession.sessions_from_ids See merge request gitlab-org/gitlab-ce!30561
\| * \| \| \| \| \| \|	Do Redis lookup in batches in ActiveSession.sessions_from_ids	Imre Farkas	2019-07-17	3	-4/+26
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By doing smaller mget calls to Redis, it can better schedule the workload. Currently a single mget with a lot of keys can keep Redis busy for long, while nothing in its queue gets processed.
* \| \| \| \| \| \|	Merge branch ↵	James Lopez	2019-07-17	4	-53/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'if-12036-move_external_authorization_service_api_management_to_ee' into 'master' CE port of "Move external authorization service API management to EE" See merge request gitlab-org/gitlab-ce!30578
\| * \| \| \| \| \| \|	CE port of "Move external authorization service API management to EE"	Imre Farkas	2019-07-17	4	-53/+6
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14598
* \| \| \| \| \| \|	Merge branch 'sh-bump-fog-aws' into 'master'	Sean McGivern	2019-07-17	3	-3/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump fog-aws to v3.5.2 Closes #63041 See merge request gitlab-org/gitlab-ce!30803