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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Custom project templates also on GitLab.com	Evan Read	2019-08-02	1	-2/+2
\|
*	Merge branch ↵	Kushal Pandya	2019-08-02	5	-4/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58256-incorrect-empty-state-message-displayed-on-explore-projects-tab' into 'master' Resolve Incorrect empty state message on "Explore projects" Closes #58256 See merge request gitlab-org/gitlab-ce!25578
\| *	Resolve Incorrect empty state message on "Explore projects"	Dennis Tang	2019-08-02	5	-4/+11
\|/
*	Merge branch 'georgekoltsov/64501-update-ldap-doc' into 'master'	Evan Read	2019-08-02	1	-7/+10
\|\ \| \| \| \| \| \| \| \|	Update ldap#security section See merge request gitlab-org/gitlab-ce!31335
\| *	Update ldap#security section	George Koltsov	2019-08-02	1	-7/+10
\|/
*	Merge branch 'compat-check-docs-update' into 'master'	Lin Jen-Shin	2019-08-02	7	-11/+12
\|\ \| \| \| \| \| \| \| \|	Exclude docs from ee_compat_check See merge request gitlab-org/gitlab-ce!31397
\| *	Update regex for docs branches in ci	Marcel Amirault	2019-08-02	7	-11/+12
\|/ \| \| \|	Changes * to + to be more precise with acceptable branch names
*	Merge branch 'sh-mermaid-subgraph-docs' into 'master'	Evan Read	2019-08-02	1	-0/+43
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Document required quotes in Mermaid subgraph titles Closes #65338 See merge request gitlab-org/gitlab-ce!31312
\| *	Document required quotes in Mermaid subgraph titlessh-mermaid-subgraph-docs	Stan Hu	2019-07-31	1	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mermaid v8.2.3 added support for styling in subgraphs, but if there are multiple words in a title, quotes are required. * https://github.com/knsv/mermaid/pull/845 * https://github.com/knsv/mermaid/issues/391#issuecomment-495602059 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65338
* \|	Merge branch 'mk/add-rate-limit-docs' into 'master'	Evan Read	2019-08-02	8	-12/+212
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rate limit docs Closes #41308 See merge request gitlab-org/gitlab-ce!30829
\| * \|	Add rate limit docs	Michael Kozono	2019-08-02	8	-12/+212
\|/ /
* \|	Merge branch '59521-job-sidebar-has-a-blank-block' into 'master'	Paul Slaughter	2019-08-02	3	-5/+34
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove blank block from job sidebar Closes #59521 See merge request gitlab-org/gitlab-ce!30754
\| * \|	Only render job sidebar block if it has content	Miranda Fluharty	2019-08-02	3	-5/+34
\|/ / \| \| \| \| \| \| \| \| \| \|	Change sidebar's renderBlock() to return true only if any of the block's <detail-row>s will be rendered Change block to render only if renderBlock() returns true
* \|	Merge branch 'docs/jira_server_create_user' into 'master'	Evan Read	2019-08-02	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Corrected name of Jira group See merge request gitlab-org/gitlab-ce!31358
\| * \|	Corrected name of Jira group	Russell Dickenson	2019-08-02	1	-2/+2
\|/ /
* \|	Merge branch 'patch-72' into 'master'	Evan Read	2019-08-02	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update global dashboard shortcuts See merge request gitlab-org/gitlab-ce!31281
\| * \|	Update global dashboard shortcuts	Nishad Sohoni	2019-08-02	1	-5/+5
\|/ / \| \| \| \| \| \|	Needs shift keypress
* \|	Merge branch '10646-create-drafts-with-commit-id-ce' into 'master'	Paul Slaughter	2019-08-02	9	-8/+81
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520 See merge request gitlab-org/gitlab-ce!30284
\| * \|	Backport from EE10646-create-drafts-with-commit-id-ce	jboyson1	2019-08-01	2	-0/+4
\| \| \|
\| * \|	Make diff_refs_match_commit validation reusable	Patrick Bajao	2019-08-01	4	-7/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move it to DiffPositionableNote concern which will be re-used in EE in DraftNote model.
\| * \|	Add commit_id to draft_notes table	Patrick Bajao	2019-08-01	3	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520
* \| \|	Merge branch 'add-cop-for-rspec-file-paths' into 'master'	Ash McKenzie	2019-08-02	19	-66/+150
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add RSpec/TopLevelDescribePath cop See merge request gitlab-org/gitlab-ce!31241
\| * \| \|	Quarantine folder containing only a folder specadd-cop-for-rspec-file-paths	Sean McGivern	2019-08-01	1	-1/+2
\| \| \| \|
\| * \| \|	Remove snippet breadcrumb spec	Sean McGivern	2019-08-01	1	-19/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We removed the breadcrumbs in 0def36777e3f9e5f57fd0e1ebd023b43229622fc.
\| * \| \|	Fix project nav specs	Sean McGivern	2019-08-01	1	-2/+2
\| \| \| \|
\| * \| \|	Remove mail_google_schema_whitelisting spec	Sean McGivern	2019-08-01	1	-27/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This task was removed in 2014! The spec wasn't, probably because it didn't fail as it was never executed. See 0fc5c80207a1ebcfbdae1d0d16b9aeb984bac271.
\| * \| \|	Fix milestone view specs	Sean McGivern	2019-08-01	3	-2/+3
\| \| \| \|
\| * \| \|	Fix labels issuable link specs	Sean McGivern	2019-08-01	3	-15/+40
\| \| \| \|
\| * \| \|	Rename broken spec files	Sean McGivern	2019-08-01	15	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RSpec only executes files ending in _spec.rb.
\| * \| \|	Add RSpec/TopLevelDescribePath cop	Sean McGivern	2019-08-01	3	-0/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The RSpec/FilePath cop checks that a spec file's path is correct, but only if the file describes a constant. We want to check, for any file with a top-level `describe`, whether the file path ends in `_spec.rb`. We don't care what comes before that; just that it will be executed by RSpec at all.
* \| \| \|	Merge branch '9928-add-security-approvals-docs' into 'master'	Evan Read	2019-08-02	2	-0/+42
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for Security Approvals for MRs See merge request gitlab-org/gitlab-ce!30959
\| * \| \| \|	Add documentation for Security Approvals for MRs	Lucas Charles	2019-08-02	2	-0/+42
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Documents how to enable security approvals
* \| \| \|	Merge branch 'ce-update-echarts' into 'master'	Paul Slaughter	2019-08-01	2	-9/+8
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	(CE Port) Remove local echarts dependency See merge request gitlab-org/gitlab-ce!31282
\| * \| \|	Remove local echarts dependency	Martin Wortschack	2019-08-01	2	-9/+8
\|/ / / \| \| \| \| \| \| \| \| \|	- Update package.json and yarn.lock
* \| \|	Merge branch 'revert-editor-indents' into 'master'	Michael Kozono	2019-08-01	16	-1287/+39
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'mh/editor-indents' into 'master'" See merge request gitlab-org/gitlab-ce!31391
\| * \| \|	Revert "Merge branch 'mh/editor-indents' into 'master'"revert-editor-indents	Paul Slaughter	2019-08-01	16	-1287/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 28f2225bdfee4d353f07a766c6c8b29ba6181397, reversing changes made to 96ae5bd83da31350e9856a290127d7aa1469710a.
* \| \| \|	Merge branch 'ce-docker_image_replication' into 'master'	Douglas Barbosa Alexandre	2019-08-01	9	-3/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809 See merge request gitlab-org/gitlab-ce!31375
\| * \| \| \|	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809ce-docker_image_replication	Valery Sizov	2019-08-01	9	-3/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introducing Docker Registry replication
* \| \| \| \|	Merge branch 'id-user-auto-complete-can-merge' into 'master'	Robert Speicher	2019-08-01	4	-1/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add can_merge option to autocomplete response See merge request gitlab-org/gitlab-ce!30565
\| * \| \| \| \|	Add can_merge option to autocomplete response	Igor	2019-08-01	4	-1/+62
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's used only if merge_request_iid param is provided
* \| \| \| \|	Merge branch 'bvl-fix-relative-positioning-rename-ce' into 'master'	Robert Speicher	2019-08-01	1	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip specs for default relative positions See merge request gitlab-org/gitlab-ce!31390
\| * \| \| \| \|	Skip specs for default relative positions	Bob Van Landuyt	2019-08-01	1	-1/+6
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a model has a default relative position we don't need to test that it is moved to the end, it will instead get the default value assigned.
* \| \| \| \|	Merge branch '63707-tiller-is-installed-on-a-specific-node-pool-docs' into ↵	Rémy Coutable	2019-08-01	1	-9/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Document the current state of the Review App clusters Closes #63707 See merge request gitlab-org/gitlab-ce!31385
\| * \| \| \| \|	Document the current state of the Review App clusters	Rémy Coutable	2019-08-01	1	-9/+22
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'	Stan Hu	2019-08-01	15	-78/+316
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use NotesFinder to fetch notes on API and Controllers Closes #52123 See merge request gitlab-org/gitlab-ce!31300
\| * \| \| \|	Change block parameter name to params52123-issuable-actions-notesfinder-pderichs	Patrick Derichs	2019-08-01	2	-3/+3
\| \| \| \| \|
\| * \| \| \|	Use NotesFinder in IssuableActions module	Patrick Derichs	2019-08-01	15	-78/+316
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove project from NotesFinder constructor Add project parameter to specs Also look for methods in private scope Fix specs to match new NotesFinder constructor
* \| \| \| \|	Merge branch 'mc-reduce-namespaces-lease-time' into 'master'	Douglas Barbosa Alexandre	2019-08-01	2	-45/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hardcodes namespaces lease timing value to 1.5h See merge request gitlab-org/gitlab-ce!31341
\| * \| \| \| \|	Hardcodes namespaces lease timing value to 1.5h	Mayra Cabrera	2019-08-01	2	-45/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After measuring the response and performance of the workers on https://gitlab.com/gitlab-org/gitlab-ce/issues/64092, we've decided 1.5 is fine for now. The time can be decreased later in the future when enforcing the quota limits Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/64092
* \| \| \| \|	Merge branch 'osw-avoid-errors-due-to-concurrent-calls' into 'master'	Douwe Maan	2019-08-01	7	-27/+128
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add exclusive lease to mergeability check process See merge request gitlab-org/gitlab-ce!31082