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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove docs from ee_compat_check testingcompat-check-docs-update	Marcel Amirault	2019-08-02	2	-1/+2
\|
*	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
\| * \| \|	Add exclusive lease to mergeability check processosw-avoid-errors-due-to-concurrent-calls	Oswaldo Ferreira	2019-07-31	7	-27/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Concurrent calls to UserMergeToRef RPC updating a single ref can lead to an opaque fail that is being rescued at Gitaly. So this commit adds an exclusive lease to the mergeability check process with the key as the current MR ID.
* \| \| \|	Merge branch 'jupyter-fixes-v1' into 'master'	Mike Greiling	2019-08-01	3	-0/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jupyter fix hostname editing and remove extra load balancer Closes #59740 and #62686 See merge request gitlab-org/gitlab-ce!31332
\| * \| \| \|	Jupyter fix hostname editing and remove extra load balancer	Amit Rathi	2019-08-01	3	-0/+10
\|/ / / /
* \| \| \|	Merge branch 'implement-dag' into 'master'	Sean McGivern	2019-08-01	24	-74/+567
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add initial support for DAG Closes #47063 See merge request gitlab-org/gitlab-ce!31328
\| * \| \| \|	Add support for DAG	Kamil Trzciński	2019-08-01	24	-74/+567
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This implements the support for `needs:` keyword as part of GitLab CI. That makes some of the jobs to be run out of order.
* \| \| \|	Merge branch '65321-review-stop-fails-when-the-branch-is-deleted-upon-merge' ↵	Lin Jen-Shin	2019-08-01	1	-3/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Ensure `review-stop` can run even when the branch has been deleted Closes #65321 See merge request gitlab-org/gitlab-ce!31277
\| * \| \| \|	Ensure review-stop can run even when the branch has been deleted65321-review-stop-fails-when-the-branch-is-deleted-upon-merge	Rémy Coutable	2019-08-01	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'rename-relative-position-move-to-end' into 'master'	Bob Van Landuyt	2019-08-01	3	-10/+13
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug when moving batches of items to the end See merge request gitlab-org/gitlab-ce!31351
\| * \| \| \|	Fix bug when moving batches of items to the endrename-relative-position-move-to-end	Heinrich Lee Yu	2019-08-01	3	-10/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Starts from START_POSITION when there are no existing positions. Also improves the test to actually test the behavior
* \| \| \| \|	Merge branch 'qa-ml-fix-file-size-test' into 'master'	Walmyr	2019-08-01	1	-6/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix push file size test Closes gitlab-org/quality/nightly#113 See merge request gitlab-org/gitlab-ce!31321
\| * \| \| \| \|	Fix push file size testqa-ml-fix-file-size-test	Mark Lapierre	2019-07-31	1	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And remove it from quarantine
* \| \| \| \| \|	Merge branch 'ticket_126158_vlad' into 'master'	Tom Atkins	2019-08-01	1	-2/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Portray better use of types of variables in .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!31232
\| * \| \| \| \|	Portray better use of types of variables in .gitlab-ci.yml	Vlad Stoianovici	2019-08-01	1	-2/+5
\|/ / / / /
* \| \| \| \|	Merge branch 'qa-ml-add-package-and-qa-always' into 'master'	Rémy Coutable	2019-08-01	1	-4/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new `package-and-qa-always` job See merge request gitlab-org/gitlab-ce!31270
\| * \| \| \| \|	Implement review suggestions	Mark Lapierre	2019-08-01	1	-4/+16
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make package-and-qa manual so the default `on_success` doesn't need to be set on package-and-qa-always. Remove unnecessary `except: []`
* \| \| \| \|	Merge branch 'double-slash-64592' into 'master'	Kamil Trzciński	2019-08-01	4	-11/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent Double Slash in Review Apps Path Closes #64592 See merge request gitlab-org/gitlab-ce!31212
\| * \| \| \| \|	Use Array.join rather than URI.join	Jason Goodman	2019-08-01	4	-11/+35
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for cases where URI.join does not work as expected
* \| \| \| \|	Merge branch '62178-remove-manual-sorting-feature-flag' into 'master'	Sean McGivern	2019-08-01	4	-10/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the manual sorting feature flag See merge request gitlab-org/gitlab-ce!30131
\| * \| \| \| \|	Remove manual_sorting flag from FE62178-remove-manual-sorting-feature-flag	Rajat Jain	2019-07-31	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove backend use of manual_sorting feature flag	Brett Walker	2019-07-31	3	-9/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-backtrace-clean-sidekiq' into 'master'	Sean McGivern	2019-08-01	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add additional paths to clean from backtrace See merge request gitlab-org/gitlab-ce!31363
\| * \| \| \| \| \|	Add additional paths to clean from backtracesh-backtrace-clean-sidekiq	Stan Hu	2019-07-31	1	-0/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Gitlab::Profiler` can also be used to profile Sidekiq jobs. Add some call traces that can be omitted from the backtrace.
* \| \| \| \| \|	Merge branch 'sh-fix-infite-loop-peek-bar' into 'master'	Sean McGivern	2019-08-01	2	-5/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix SystemStackError when Peek bar is active with Rugged calls Closes #65404 See merge request gitlab-org/gitlab-ce!31357
\| * \| \| \| \| \|	Fix SystemStackError when Peek bar is active with Rugged callssh-fix-infite-loop-peek-bar	Stan Hu	2019-07-31	2	-5/+13
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Peek attempts to serialize results with `to_json`, which calls `ActiveSupport::JSON`. If an object is passed to `to_json` that contains instance variables, `ActiveSupport` will attempt to recursively traverse all variables. The problem is that we can get into an infinite loop if the instance references to an instance that references to something else that points back to the same instance. To avoid this mess, we just call `to_s` on the object. It appears only `Gitlab::Git::Repository` and `::Repository` are the culprits here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65404
* \| \| \| \| \|	Merge branch '65003-remove-wait_for_review_app_to_be_accessible-step' into ↵	Lin Jen-Shin	2019-08-01	2	-27/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove the wait_for_review_app_to_be_accessible step from review-deploy Closes #65003 See merge request gitlab-org/gitlab-ce!31296
\| * \| \| \| \| \|	Remove the wait_for_review_app_to_be_accessible step from review-deploy65003-remove-wait_for_review_app_to_be_accessible-step	Rémy Coutable	2019-07-30	2	-27/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'docs-gitaly-secrets-mismatch-harishsr' into 'master'	Achilleas Pipinellis	2019-08-01	1	-0/+91
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Troubleshooting steps when there are different Gitaly node secrets See merge request gitlab-org/gitlab-ce!30977
\| * \| \| \| \| \| \|	Troubleshooting steps when there are different Gitaly node secrets	Harish Ramachandran	2019-08-01	1	-0/+91
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'mnguyen4-master-patch-95950' into 'master'	Achilleas Pipinellis	2019-08-01	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Link to Seismic Shift Whitepaper to /dast/ landing page See merge request gitlab-org/gitlab-ce!30868