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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Clean up CSS; fix specsPOC-right-sidebar-updates	Annabel Dunstone Gray	2019-04-29	1	-1/+1
\|
*	Merge branch 'revert-55767af4' into 'master'	Filipa Lacerda	2019-04-26	1	-6/+0
\|\ \| \| \| \| \| \| \| \|	Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'" See merge request gitlab-org/gitlab-ce!27727
\| *	Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into ↵	Phil Hughes	2019-04-26	1	-6/+0
\| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !27589
* \|	Merge branch 'use-constant-for-helm-runner-check' into 'master'	Grzegorz Bizon	2019-04-26	1	-2/+2
\|\ \ \| \|/ \|/\| \| \| \| \|	Use constants for asserstion for helm chart test See merge request gitlab-org/gitlab-ce!27629
\| *	Use constants for assertion for helm chart test	Steve Azzopardi	2019-04-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are duplicating the value from the constant `Clusters::Applications::Runner::VERSION` inside of the tests which results into developers having to update the tests as well when they want to upgrade the Helm chart used for GitLab Runner
* \|	Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'	Filipa Lacerda	2019-04-26	1	-0/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "MR Popover is not attached in system notes" Closes #60855 See merge request gitlab-org/gitlab-ce!27589
\| * \|	Init MR Popovers onmount of system note60855-mr-popover-is-not-attached-in-system-notes	Sam Bigelow	2019-04-24	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Fixing a bug where system notes had no MR Popovers
* \| \|	Merge branch '60808-only-show-target-branch-advanced-error-before-merge' ↵	Filipa Lacerda	2019-04-26	1	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Don't show the "target branch advanced" error message after merge Closes #60808 See merge request gitlab-org/gitlab-ce!27588
\| * \| \|	Only show message when MR is open60808-only-show-target-branch-advanced-error-before-merge	Nathan Friend	2019-04-24	1	-0/+16
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This commit fixes the bug that was causing the "target branch has "advanced" error message to display after an MR was closed.
* \| \|	Use a FSM to determine application next state	Enrique Alcántara	2019-04-26	5	-93/+200
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Separate cluster application UI state from server-side app status - Use a state machine to determine cluster application next state - Instead of using two variables to keep track of when an app is installing or updating, just use the app status property and control server-side and user events using the FSM service.
* \| \|	Merge branch 'osw-separate-ee-side-of-protected-branch' into 'master'	Sean McGivern	2019-04-26	4	-27/+60
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Port] Extract EE specific tests for protected branches/tags See merge request gitlab-org/gitlab-ce!27640
\| * \| \|	Extract EE specific tests for protected branches/tags	Oswaldo Ferreira	2019-04-25	4	-27/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have the spec files containing EE specific code for spec/features/protected_branches_spec.rb and spec/features/protected_tags_spec.rb. This commit deletes / extracts the CE part of it.
* \| \| \|	Merge branch 'refactor/58827-migrate-issue-spec-to-jest' into 'master'	Kushal Pandya	2019-04-26	5	-243/+189
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrated issue spec files to Jest Closes #58827 See merge request gitlab-org/gitlab-ce!27673
\| * \| \| \|	refactor(issue): Refactored issue tests from Karma to Jest	Martin Hobert	2019-04-25	5	-243/+189
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	re #58827 Added changelog Added sync false, and removed unneeded destroyers
* \| \| \| \|	Merge branch 'migrate-import-projects-spec' into 'master'	Kushal Pandya	2019-04-26	5	-240/+252
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move import projects karma specs to jest Closes #60204 See merge request gitlab-org/gitlab-ce!27552
\| * \| \| \| \|	Move import projects karma specs to jest	Luke Bennett	2019-04-25	5	-240/+252
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to the stability/validity of the specs.
* \| \| \| \| \|	Merge branch '60906-fix-wiki-links' into 'master'	Stan Hu	2019-04-25	1	-0/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use wiki partial in search results Closes #60906 See merge request gitlab-org/gitlab-ce!27634
\| * \| \| \| \| \|	Use wiki partial in search results	Mario de la Ossa	2019-04-25	1	-0/+24
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Implement toast component	Jacques Erasmus	2019-04-25	1	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implemented the toast component for success messages
* \| \| \| \| \|	test(Refactored notes tests from Karma to Jest):	Martin Hobert	2019-04-25	3	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #58829 Added changelog entry Added merge request id
* \| \| \| \| \|	Put a failing spec in quarantine60953-broken-master	Rémy Coutable	2019-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'fix-lazy-blobs-requesting-all-previous-blobs' into 'master'	Dmitriy Zaporozhets	2019-04-25	1	-0/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that we only request blobs in one batch Closes #60829 See merge request gitlab-org/gitlab-ce!27625
\| * \| \| \| \| \|	Ensure that we only request blobs in one batch	Sean McGivern	2019-04-24	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Blob.lazy adds a blob to a batch to load at a later point, using the BatchLoader library. Whenever any lazy blob's attributes are accessed, all lazy blobs requested to that point will be loaded. BatchLoader, the library we use for this, should only request items in a batch once. That is, if we have these batches: 1. a, b, c 2. d, e, f Then a, b, and c should only be requested in the first batch. But if you modify the list of items in the batch, then the second batch will request a, b, c, d, e, f, which is almost certainly not what we want! https://github.com/exAspArk/batch-loader/issues/44 is the upstream issue for this, but we can also solve this in our application by not modifying the arguments we're using inside a BatchLoader batch.
* \| \| \| \| \| \|	Merge branch 'winh-typo-blob_spec' into 'master'	Lin Jen-Shin	2019-04-25	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in blob_spec.rb See merge request gitlab-org/gitlab-ce!27661
\| * \| \| \| \| \| \|	Fix typo in blob_spec.rb	Winnie Hellmann	2019-04-25	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'get-rid-of-user-namespace-method' into 'master'	Dmitriy Zaporozhets	2019-04-25	1	-12/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get rid of the user_namespace API helper method See merge request gitlab-org/gitlab-ce!27636
\| * \| \| \| \| \| \| \|	Get rid of the user_namespace API helper method	Rémy Coutable	2019-04-24	1	-12/+0
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Escape special characters in GFM auto complete highlighting	Jan Beckmann	2019-04-25	1	-0/+32
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #60552
* \| \| \| \| \| \|	Update list_last_commits_for_tree response path field to path_bytes	John Cai	2019-04-24	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates the gitaly client to use path_bytes field instead of the deprecated path field in list_last_commits_for_tree_response. Also adds a test to guard against non-utf8 path data
* \| \| \| \| \| \|	Added list_pages method to avoid loading all wiki pages content	Francisco Javier López	2019-04-25	5	-64/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Inside a wiki, when we show the sidebar or browse to the `pages`, all page contents are retrieved from Gitaly and that is a waste of resources, since no content from that pages are going to be showed. This MR introduces the method `ProjectWiki#list_pages`, which uses new wiki_list_pages RPC call to retrieve pages without content Also in the `WikisController` we're using the method to show pages in the sidebar and also on the `pages` page.
* \| \| \| \| \| \|	Merge branch '60687-enviro-dropdown' into 'master'	Fatih Acet	2019-04-24	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586
\| * \| \| \| \| \| \|	Fix Metrics environments dropdown60687-enviro-dropdown	Simon Knox	2019-04-24	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also bring back EE dashboard component
* \| \| \| \| \| \|	Merge branch 'fix-api-ide-relative-url-root' into 'master'	Fatih Acet	2019-04-24	1	-1/+13
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API and IDE path with `/` relative_url_root See merge request gitlab-org/gitlab-ce!27635
\| * \| \| \| \| \|	Fix API and IDE path with `/` relative_url_root	Paul Slaughter	2019-04-24	1	-1/+13
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? Previously we simply concatenated our paths, which led to requesting `//api/v4/...` and obviously failed. The BE supports a relative_url_root of `/`. It's a bug that the FE does not.
* \| \| \| \| \|	Merge branch '60387-use-icons-in-user-popovers' into 'master'	Tim Zallmann	2019-04-24	1	-0/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show category icons in user popover Closes #60387 See merge request gitlab-org/gitlab-ce!27254
\| * \| \| \| \| \|	Show category icons in user popover	Kushal Pandya	2019-04-22	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show bio, organization and location icons within user popover.
* \| \| \| \| \| \|	Put some flaky specs in quarantine	Rémy Coutable	2019-04-24	2	-6/+3
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' ↵	Stan Hu	2019-04-24	1	-0/+9
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "500 error on save of general pipeline settings timeout" Closes gitlab-ee#11281 See merge request gitlab-org/gitlab-ce!27416
\| * \| \| \| \|	Redirect to settings page on invalid update	Matija Čupić	2019-04-24	1	-0/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Fix bug when project export to remote url fails	Francisco Javier López	2019-04-24	1	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-ci-variable-protected-ref' into 'master'	Grzegorz Bizon	2019-04-24	3	-3/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI variable CI_REF_PROTECTED See merge request gitlab-org/gitlab-ce!26716
\| * \| \| \| \| \|	Make sure that CI_COMMIT_REF_PROTECTED is a bool	Jason van den Hurk	2019-04-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Change CI_REF_PROTECTED variable to CI_COMMIT_REF_PROTECTED	Jason van den Hurk	2019-04-10	3	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added the CI_REF_PROTECTED variable to the Gitlab runner	Jason van den Hurk	2019-04-10	3	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This variable shows if the branch the runner is executing is protected or not. References: #50909
* \| \| \| \| \| \|	Resolve "Merge Request Popover is not working on the To Do page"	Sam Bigelow	2019-04-24	2	-2/+38
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-disable-internal-ids-available-check' into 'master'	Sean McGivern	2019-04-24	1	-1/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always use internal ID tables in development and production Closes #60718 See merge request gitlab-org/gitlab-ce!27544
\| * \| \| \| \| \| \|	Always use internal ID tables in development and productionsh-disable-internal-ids-available-check	Stan Hu	2019-04-22	1	-1/+10
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid quiet failures that cause consistency errors in the database, we should now assume that the internal_ids table is available since we've had this table for close to a year. For tests that have migrations, we make this check thread-safe via SafeRequestStore. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60718
* \| \| \| \| \| \|	Remove "You are already signed in" banner	Illya Klymov	2019-04-24	1	-3/+13
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch '10096-gfm-autocomplete-ce' into 'master'	Kushal Pandya	2019-04-24	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move EE specific GfmAutocomplete code to EE file See merge request gitlab-org/gitlab-ce!27611
\| * \| \| \| \| \|	Move EE specific GfmAutocomplete code to EE file10096-gfm-autocomplete-ce	Rajat Jain	2019-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor GfmAutocomplete and create a new EE counterpart which is referenced through `ee_else_ce`