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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Again run quarantine specs if tag providedtc-reanble-running-quarantined-specs	Toon Claes	2019-08-02	1	-2/+2
\| \| \| \| \| \|	In f59438c0a9da7bb4d98291d2adedfc5a13a50798 we changed how quarantined specs are excluded. But that made it impossible to run them by providing `--tag quarantine`, this changes that.
*	Merge branch 'fe-cleanup-job-app-spec' into 'master'	Fatih Acet	2019-08-02	1	-396/+287
\|\ \| \| \| \| \| \| \| \|	Clean up job_app_spec See merge request gitlab-org/gitlab-ce!31400
\| *	Clean up job_app_specfe-cleanup-job-app-spec	Paul Slaughter	2019-08-01	1	-396/+287
\| \| \| \| \| \| \| \| \| \|	- Remove setTimeout calls - Add helper function to encapsulate setup
* \|	Merge branch '63571-fix-gc-profiler-data-being-wiped' into 'master'	Kamil Trzciński	2019-08-02	6	-53/+44
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix GC::Profiler metrics fetching See merge request gitlab-org/gitlab-ce!31331
\| * \|	Call `GC::Profiler.clear` only in one place	Aleksei Lipniagov	2019-08-02	6	-53/+44
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, both InfluxSampler and RubySampler were relying on the `GC::Profiler.total_time` data which is the sum over the list of captured GC events. Also, both samplers asynchronously called `GC::Profiler.clear` which led to incorrect metric data because each sampler has the wrong assumption it is the only object who calls `GC::Profiler.clear` and thus could rely on the gathered results between such calls. We should ensure that `GC::Profiler.total_time` is called only in one place making it possible to rely on accumulated data between such wipes. Also, we need to track the amount of profiler reports we lost.
* \|	Merge branch 'fix-bin-web-puma-script-to-consider-rails-env' into 'master'	Kamil Trzciński	2019-08-02	2	-1/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make `bin/web_puma` consider RAILS_ENV See merge request gitlab-org/gitlab-ce!31378
\| * \|	Make `bin/web_puma` consider RAILS_ENVfix-bin-web-puma-script-to-consider-rails-env	Aleksei Lipniagov	2019-08-01	2	-1/+6
\| \| \|
* \| \|	Merge branch 'sh-fix-mermaid-subgraphs-docs' into 'master'test-assinging	Evan Read	2019-08-02	4	-28/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Mermaid Markdown for testing guide docs See merge request gitlab-org/gitlab-ce!31322
\| * \| \|	Use Mermaid Markdown for testing guide docssh-fix-mermaid-subgraphs-docs	Stan Hu	2019-08-01	4	-28/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove PNGs in favor of dynamically rendered graphs * Eliminate <b> styling because this is no longer supported * Change <br /> to <br> because the latter is only supported * Add quotes around subgraph titles
* \| \| \|	Merge branch 'docs/project-templates-also-on-gitlab-com' into 'master'	Achilleas Pipinellis	2019-08-02	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Custom project templates also on GitLab.com See merge request gitlab-org/gitlab-ce!31396
\| * \| \| \|	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