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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted	Simon Knox	2018-03-19	799	-5830/+10989
\|\ \| \| \| \| \| \|	43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted
\| *	Merge branch 'update-kubeclient' into 'master'	Grzegorz Bizon	2018-03-19	12	-22/+23
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update kubeclient 2.2.0 -> 3.0 Closes #43911 See merge request gitlab-org/gitlab-ce!17739
\| \| *	Merge branch 'master' into 'update-kubeclient'	Grzegorz Bizon	2018-03-17	233	-3409/+5755
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Gemfile.lock
\| \| * \|	Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)	Pirate Praveen	2018-03-15	10	-10/+10
\| \| \| \|
\| \| * \|	Update kubeclient 2.2.0 -> 3.0	Pirate Praveen	2018-03-14	2	-12/+12
\| \| \| \|
\| * \| \|	Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' ↵	Mike Greiling	2018-03-19	5	-32/+43
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Move UnresolvedDiscussions vue component See merge request gitlab-org/gitlab-ce!17538
\| \| * \| \|	Move UnresolvedDiscussions vue component	George Tsiolis	2018-03-08	5	-32/+43
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'	Kamil Trzciński	2018-03-18	6	-7/+55
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify ambiguous with_artifacts implication Closes #44138 See merge request gitlab-org/gitlab-ce!17720
\| \| * \| \| \|	Fix specfix/sm/clarify-ambiguous-with_artifacts-implication	Shinya Maeda	2018-03-16	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Use with_artifacts_archive name. Add spec	Shinya Maeda	2018-03-15	4	-6/+42
\| \| \| \| \| \|
\| \| * \| \| \|	Fix corrupted test	Shinya Maeda	2018-03-15	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add feartue spec. Fix failed test	Shinya Maeda	2018-03-15	2	-1/+13
\| \| \| \| \| \|
\| \| * \| \| \|	Add rubocop:disable GitlabSecurity/PublicSend	Shinya Maeda	2018-03-15	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Clarify ambiguous with_artifacts implication	Shinya Maeda	2018-03-15	3	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix-dropzone-project-show' into 'master'	Jacob Schatz	2018-03-18	3	-4/+44
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dropzone project show Closes #44137 See merge request gitlab-org/gitlab-ce!17784
\| \| * \| \| \|	Fix dropzone project show	Clement Ho	2018-03-18	3	-4/+44
\| \|/ / / /
\| * \| \| \|	Merge branch 'sh-fix-module-reloading' into 'master'	Robert Speicher	2018-03-16	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "A copy of Gitlab::Metrics::Methods" have been removed error Closes #44365 See merge request gitlab-org/gitlab-ce!17810
\| \| * \| \| \|	Fix "A copy of Gitlab::Metrics::Methods" have been removed error	Stan Hu	2018-03-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44365
\| * \| \| \| \|	Merge branch 'acet-notes-prettified' into 'master'	Mike Greiling	2018-03-16	26	-1792/+2149
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prettify notes app See merge request gitlab-org/gitlab-ce!17812
\| \| * \| \| \| \|	Prettify notes.	Fatih Acet	2018-03-16	26	-1792/+2149
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'profile-notifications-dropdown-fix' into 'master'	Filipa Lacerda	2018-03-16	2	-1/+8
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed profile notifications not being editable Closes #44198 See merge request gitlab-org/gitlab-ce!17808
\| \| * \| \| \| \| \|	Fixed profile notifications not being editableprofile-notifications-dropdown-fix	Phil Hughes	2018-03-16	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44198
\| * \| \| \| \| \| \|	Merge branch '39521-fix-merge-request-discussion-timestamp-overflow' into ↵	Fatih Acet	2018-03-16	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Right column of merge request discussion overflows" Closes #39521 See merge request gitlab-org/gitlab-ce!17550
\| \| * \| \| \| \| \|	Fix discussion timestamp overflow in merge request parallel view39521-fix-merge-request-discussion-timestamp-overflow	dtang	2018-03-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'sh-optimize-admin-projects-page' into 'master'	Robert Speicher	2018-03-16	2	-2/+6
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix timeouts loading /admin/projects page Closes #44338 See merge request gitlab-org/gitlab-ce!17785
\| \| * \| \| \| \| \|	Fix timeouts loading /admin/projects pagesh-optimize-admin-projects-page	Stan Hu	2018-03-15	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These extra sort keys caused sequential scans on the namespaces and projects page. Removing them makes the page load on GitLab.com. Closes #44338
\| * \| \| \| \| \| \|	Merge branch 'toon-master-patch-57286' into 'master'	Marin Jankovski	2018-03-16	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename manual job to `package-and-qa` See merge request gitlab-org/gitlab-ce!17807
\| \| * \| \| \| \| \| \|	Rename manual job to `package-and-qa`	Toon Claes	2018-03-16	1	-1/+1
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	To make it more clear it's building the package and doing QA, rename the job.
\| * \| \| \| \| \| \|	Merge branch 'opnshift-docs-patch' into 'master'	Marcia Ramos	2018-03-16	1	-1/+10
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OpenShift install docs: Recommend "add-scc-to-user" over "edit scc" See merge request gitlab-org/gitlab-ce!17787
\| \| * \| \| \| \| \| \|	OpenShift install docs: Recommend "add-scc-to-user" over "edit scc"	Joe Mullally	2018-03-16	1	-1/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'jramsay-43804-jupyter-docs' into 'master'	Marcia Ramos	2018-03-16	2	-0/+18
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Jupyter Notebook docs Closes #43804 See merge request gitlab-org/gitlab-ce!17495
\| \| * \| \| \| \| \| \|	Add Jupyter Notebook docs	James Ramsay	2018-03-16	2	-0/+18
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'gitaly-0.91.0' into 'master'	Robert Speicher	2018-03-16	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.91.0 See merge request gitlab-org/gitlab-ce!17802
\| \| * \| \| \| \| \| \|	Use Gitaly 0.91.0	Jacob Vosmaer	2018-03-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'update_vendored_gitlab_ci_yml' into 'master'	Robert Speicher	2018-03-16	1	-6/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update vendored gitlab-ci.yml template for auto-devops See merge request gitlab-org/gitlab-ce!17804
\| \| * \| \| \| \| \| \| \|	Update vendored gitlab-ci.yml template for auto-devops	Olivier Gonzalez	2018-03-16	1	-6/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch ↵	Grzegorz Bizon	2018-03-16	13	-11/+60
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41902-add-api-option-to-overwrite-project-description-on-project-export' into 'master' Resolve "Extend API for exporting a project with option to overwrite project description" Closes #41902 and #34936 See merge request gitlab-org/gitlab-ce!17744
\| \| * \| \| \| \| \| \| \| \|	Adds the option to override project description on export via API	Tiago Botelho	2018-03-16	13	-11/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and fixes the project description not being imported
\| * \| \| \| \| \| \| \| \| \|	Merge branch '44126-setup-middleware-before-adapter' into 'master'	Kamil Trzciński	2018-03-16	1	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate Faraday warnings Closes #44126 See merge request gitlab-org/gitlab-ce!17795
\| \| * \| \| \| \| \| \| \| \| \|	Setup Faraday middleware before adapter	Lin Jen-Shin	2018-03-16	1	-2/+3
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This eliminate the warnings: WARNING: Unexpected middleware set after the adapter. This won't be supported from Faraday 1.0.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'jej/commit-api-tracks-lfs' into 'master'	Dmitriy Zaporozhets	2018-03-16	10	-64/+270
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create commit API and Web IDE obey LFS filters Closes #42287 See merge request gitlab-org/gitlab-ce!16718
\| \| * \| \| \| \| \| \| \| \|	Extract constant for LfsPointerFile::VERSION_LINE	James Edwards-Jones	2018-03-16	4	-7/+10
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Avoid printing data for LfsPointerFile#inspectjej/commit-api-tracks-lfs	James Edwards-Jones	2018-03-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Use correct encoding with Lfs::FileTransfromer	James Edwards-Jones	2018-03-15	4	-19/+68
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Lfs::FileTranformer caches .gitattributes parser	James Edwards-Jones	2018-03-15	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents `.gitattributes` blob lookup being repeated for every file checked at a given ref
\| \| * \| \| \| \| \| \| \| \|	Avoid failed integrity check by linking LfsObjectProjects sooner	James Edwards-Jones	2018-03-15	4	-67/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempted commits were failing due to the pre-recieve LfsIntegrity check. This is skipped during tests making this failure silent.
\| \| * \| \| \| \| \| \| \| \|	Multi-file upload and Commit API obey LFS filters	James Edwards-Jones	2018-03-15	6	-11/+193
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates Files::MultiService for the commits API which is in turn used by the multi-file upload web UI Ensures that files which should be in LFS are transformed into LFS pointers Uses Lfs::Transformer which then links LfsObjectProjects on success
\| \| * \| \| \| \| \| \| \| \|	Rename Lfs::FileModificationHandler to Lfs::FileTransformer	James Edwards-Jones	2018-03-15	2	-2/+2
\| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'docs-refactor-dev-guides' into 'master'44320-add-security-details-in-a-table-to-contributing-manual	Achilleas Pipinellis	2018-03-16	2	-296/+316
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: refactor doc general guidelines and style guidelines Closes #41281 See merge request gitlab-org/gitlab-ce!17378
\| \| * \| \| \| \| \| \| \| \|	Docs: refactor doc general guidelines and style guidelines	Marcia Ramos	2018-03-16	2	-296/+316
\| \|/ / / / / / / / /