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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Set asset image name properly for all possible CE/EE project names	Balasankar "Balu" C	2019-03-15	1	-8/+7
\| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
*	Merge branch 'refactor-boards-actions' into 'master'	Douwe Maan	2019-03-15	7	-142/+41
\|\ \| \| \| \| \| \| \| \|	Refactor groups and projects boards actions See merge request gitlab-org/gitlab-ce!25568
\| *	Remove NUMBER_OF_PERMITTED_BOARDS from Project	Heinrich Lee Yu	2019-03-13	2	-22/+1
\| \| \| \| \| \| \| \|	We already check max boards in the create service. This is not used.
\| *	Remove redirecting to last visited board	Heinrich Lee Yu	2019-03-13	3	-56/+0
\| \| \| \| \| \| \| \|	Move this to EE-only. It isn't useful here since there's only one board
\| *	Refactor groups and projects boards actions	Heinrich Lee Yu	2019-03-13	5	-82/+58
\| \| \| \| \| \| \| \|	Move common functionality to BoardsActions concern
* \|	Merge branch ↵	Lin Jen-Shin	2019-03-15	7	-53/+161
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6098-extract-ee-specific-files-lines-for-app-views-admin-application_settings' into 'master' (CE Port) Extract EE specific files/lines for app/views/admin/application_settings See merge request gitlab-org/gitlab-ce!25955
\| * \|	Move EE specific code in admin application settings	Martin Wortschack	2019-03-14	7	-53/+161
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Leverage render_if_exists - Externalize strings - Extract help page setting into EE specific partial
* \| \|	Merge branch 'improve-spec-requests-api-merge_requests_spec' into 'master'	Robert Speicher	2019-03-15	3	-380/+395
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce queries in spec/requests/api/merge_requests_spec.rb See merge request gitlab-org/gitlab-ce!26110
\| * \| \|	Reduce queries in spec/requests/api/merge_requests_spec.rb	Rémy Coutable	2019-03-13	3	-380/+395
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces the queries from 97137 to 65136 and the query time from 02:04 to 01:27 in spec/requests/api/merge_requests.rb. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'tatkins-patch-48' into 'master'	Achilleas Pipinellis	2019-03-15	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update browser requirements to be clear about minor versions. See merge request gitlab-org/gitlab-ce!25805
\| * \| \| \|	Update browser requirements to be clear about minor versions.	Tom Atkins	2019-03-06	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-namespaces-path' into 'master'	Achilleas Pipinellis	2019-03-15	1	-6/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Add link to namespace api doc to clarify URL-encoded path Closes #57292 See merge request gitlab-org/gitlab-ce!26083
\| * \| \| \| \|	Docs: Add link to namespace api doc to clarify URL-encoded path	Marcel Amirault	2019-03-15	1	-6/+6
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/edit-notes-about-remote-includes' into 'master'	Kamil Trzciński	2019-03-15	1	-8/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit note about remote includes Closes #58836 See merge request gitlab-org/gitlab-ce!25999
\| * \| \| \| \|	Centralise and simplify text	Evan Read	2019-03-15	1	-7/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix missing full stop	Evan Read	2019-03-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Edit note about remote includes	Evan Read	2019-03-12	1	-6/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '57330-fix-comment-edited' into 'master'	Sean McGivern	2019-03-15	3	-0/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide "Edited" when note is transformed or resolved Closes #57330 See merge request gitlab-org/gitlab-ce!26143
\| * \| \| \| \| \|	Hide "Edited" when note is transformed or resolved	Heinrich Lee Yu	2019-03-14	3	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes `Note#edited?` return `false` when the note body was not edited
* \| \| \| \| \| \|	Merge branch 'ce-reduce-diff-with-ee-in-migration-spec' into 'master'	Lin Jen-Shin	2019-03-15	1	-32/+51
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Reduce differences with EE in a migration spec See merge request gitlab-org/gitlab-ce!26162
\| * \| \| \| \| \| \|	Reduce differences with EE in a migration spec	Rémy Coutable	2019-03-14	1	-32/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'	Phil Hughes	2019-03-15	4	-6/+33
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Merge request page loses state" See merge request gitlab-org/gitlab-ce!25988
\| * \| \| \| \| \| \| \|	Update merge status timeout to 0	Paul Slaughter	2019-03-14	3	-4/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also stop polling if we get a bad response from the server.
\| * \| \| \| \| \| \| \|	Update simple_poll with timeout 0 and object arg	Paul Slaughter	2019-03-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why timeout 0? Sometimes we want to poll without timing out. Why an object argument? It's helpful to pass these extra properties by name. `simplePoll(cb, { timeout: 0 })` is nicer than `simplePoll(cb, undefined, 0);`
* \| \| \| \| \| \| \| \|	Merge branch '10424-env-item-spec' into 'master'	Phil Hughes	2019-03-15	1	-9/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for environment_item_spec Closes gitlab-ee#10424 See merge request gitlab-org/gitlab-ce!26185
\| * \| \| \| \| \| \| \| \|	Removes EE differences for environment_item_spec	Filipa Lacerda	2019-03-14	1	-9/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '10027-folder-bundle' into 'master'	Phil Hughes	2019-03-15	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for environments_folder_bundle Closes gitlab-ee#10027 See merge request gitlab-org/gitlab-ce!26184
\| * \| \| \| \| \| \| \| \| \|	Removes EE differences for environments_folder_bundle	Filipa Lacerda	2019-03-14	1	-0/+3
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-nightly-87-quarantine-failing-test' into 'master'	Sanad Liaquat	2019-03-15	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine failing auto devops spec See merge request gitlab-org/gitlab-ce!26207
\| * \| \| \| \| \| \| \| \| \|	Quarantine failing Auto DevOps test	Sanad Liaquat	2019-03-15	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '58738-hashed-storage-document-rollback-mechanism' into 'master'	Evan Read	2019-03-15	2	-47/+112
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hashed Storage: Document Rollback mechanism Closes #58738 See merge request gitlab-org/gitlab-ce!25960
\| * \| \| \| \| \| \| \| \| \|	Document Storage Rollback mechanism	Gabriel Mazetto	2019-03-15	2	-47/+112
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Rake-specific documentation to include storage rollback, and improved migration and rollback instructions.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix_snippet_blobs_example' into 'master'	Evan Read	2019-03-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix search scope for snippet_blobs in example See merge request gitlab-org/gitlab-ce!26093
\| * \| \| \| \| \| \| \| \| \|	Fix search scope for snippet_blobs in example	Piotr Orzechowski	2019-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-links2' into 'master'	Evan Read	2019-03-15	1	-5/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix a link that fails the link test See merge request gitlab-org/gitlab-ce!26111
\| * \| \| \| \| \| \| \| \| \| \|	Docs: Fix a link that fails the link test	Marcel Amirault	2019-03-15	1	-5/+4
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'weimeng-update-global-user-permissions-docs' into 'master'	Evan Read	2019-03-15	3	-0/+42
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document global user permission configuration See merge request gitlab-org/gitlab-ce!25632
\| * \| \| \| \| \| \| \| \| \| \|	Document global user permission configuration	Wei-Meng Lee	2019-03-15	3	-0/+42
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/refactor-pipelines-landing-page' into 'master'	Mike Lewis	2019-03-14	7	-205/+261
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and restructure pipelines landing page Closes #58450 See merge request gitlab-org/gitlab-ce!26079
\| * \| \| \| \| \| \| \| \| \| \|	Refactor and restructure pipelines landing page	Evan Read	2019-03-14	7	-205/+261
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also has other minor improvements.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'psimyn-incident-report-section-ce' into 'master'	Mike Greiling	2019-03-14	4	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of Add Incidents section to Operations settings See merge request gitlab-org/gitlab-ce!25939
\| * \| \| \| \| \| \| \| \| \| \|	Add feature specs for settings page	Reuben Pereira	2019-03-14	4	-2/+7
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for form fields Style settings sections
* \| \| \| \| \| \| \| \| \| \|	Merge branch '49863-ingress-ip-loading-state' into 'master'	Mike Greiling	2019-03-14	4	-15/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show loading spinner while Ingress/Knative IP is being assigned Closes #56945 and #49863 See merge request gitlab-org/gitlab-ce!25912
\| * \| \| \| \| \| \| \| \| \| \|	Show loading spinner for Ingress/Knative IP	Jacques Erasmus	2019-03-14	4	-15/+24
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show a loading spinner while Ingress/Knative IP is being assigned
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'some-more-factories-in-migration-specs' into 'master'	Rémy Coutable	2019-03-14	4	-32/+36
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some more factories in migration specs See merge request gitlab-org/gitlab-ce!26177
\| * \| \| \| \| \| \| \| \| \|	Remove factories from MigrateUserProjectView spec	Sean McGivern	2019-03-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove factories from user activities migration spec	Sean McGivern	2019-03-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove factories from MigrateOldArtifacts spec	Sean McGivern	2019-03-14	1	-13/+19
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove factories from AddHeadPipelineForEachMergeRequest spec	Sean McGivern	2019-03-14	1	-13/+11
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-settings-procedures' into 'master'	Achilleas Pipinellis	2019-03-14	7	-36/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some procedures with misleading instructions Closes #58355 and #58853 See merge request gitlab-org/gitlab-ce!26148