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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed profile notifications not being editableprofile-notifications-dropdown-fix	Phil Hughes	2018-03-16	2	-1/+8
\| \| \| \|	Closes #44198
*	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
\|/ / / /
* \| \| \|	Merge branch 'docs-update_code_quality_example' into 'master'	Achilleas Pipinellis	2018-03-16	1	-7/+15
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Update Code Quality example documentation See merge request gitlab-org/gitlab-ce!17788
\| * \| \|	Update Code Quality example documentationdocs-update_code_quality_example	Olivier Gonzalez	2018-03-16	1	-7/+15
\| \| \| \|
* \| \| \|	Merge branch 'docs-44273-fix-ce-install-link' into 'master'	Achilleas Pipinellis	2018-03-16	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CE install link for downgrade docs Closes #44273 See merge request gitlab-org/gitlab-ce!17757
\| * \| \| \|	Fix CE install link for downgrade docs	Mark Fletcher	2018-03-14	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-check-task-docs' into 'master'	Sean McGivern	2018-03-16	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add version available info to integrity check rake task docs See merge request gitlab-org/gitlab-ce!17799
\| * \| \| \| \|	Add version available info to integrity check rake task docs	Balasankar "Balu" C	2018-03-16	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge branch 'update-flipper' into 'master'	Grzegorz Bizon	2018-03-16	2	-11/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update flipper 0.11.0 -> 0.13.0 See merge request gitlab-org/gitlab-ce!17722
\| * \| \| \| \|	Update flipper 0.11.0 -> 0.13.0	Pirate Praveen	2018-03-13	2	-13/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '44235-update-knapsack-to-1.16.0' into 'master'	Grzegorz Bizon	2018-03-16	3	-4/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update knapsack to 1.16.0 Closes #44235 See merge request gitlab-org/gitlab-ce!17735
\| * \| \| \| \| \|	Update knapsack to 1.16.0	Takuya Noguchi	2018-03-14	3	-4/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '43522-technical-debt-service-disabled_title' into 'master'	Dmitriy Zaporozhets	2018-03-16	4	-19/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Technical debt: `Service#disabled_title` no longer used and is left dangling in `services/_form.html.haml`" Closes #43522 See merge request gitlab-org/gitlab-ce!17305
\| * \| \| \| \| \| \|	Removed unused `Service#disabled_title` methods43522-technical-debt-service-disabled_title	James Edwards-Jones	2018-03-15	4	-19/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-cache-table-exists' into 'master'	Yorick Peterse	2018-03-16	4	-1/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache table_exists?('application_settings') to reduce repeated schema reloads Closes #43355 See merge request gitlab-org/gitlab-ce!17781
\| * \| \| \| \| \| \| \|	Cache table_exists?('application_settings') to reduce repeated schema reloadssh-cache-table-exists	Stan Hu	2018-03-15	4	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #43355
* \| \| \| \| \| \| \| \|	Merge branch 'sh-cache-column-exists' into 'master'	Yorick Peterse	2018-03-16	4	-3/+23
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache column_exists? for application settings See merge request gitlab-org/gitlab-ce!17780
\| * \| \| \| \| \| \| \|	Cache column_exists? for application settingssh-cache-column-exists	Stan Hu	2018-03-15	4	-3/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is most a backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4987/diffs but includes other columns that use column_exists? in a way that may cause unnecessary schema loads.
* \| \| \| \| \| \| \| \|	Merge branch 'mr-sticky-tabs-perf-bar' into 'master'	Filipa Lacerda	2018-03-16	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes merge request bar styling when performance bar is visible See merge request gitlab-org/gitlab-ce!17778
\| * \| \| \| \| \| \| \|	Fixes merge request bar styling when performance bar is visiblemr-sticky-tabs-perf-bar	Phil Hughes	2018-03-15	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs-ee-5017-rename_sast_container_to_container_scanning' into ↵	Achilleas Pipinellis	2018-03-16	4	-60/+64
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Rename SAST for Docker to Container Scanning in documentation See merge request gitlab-org/gitlab-ce!17769
\| * \| \| \| \| \| \| \| \|	Rename SAST for Docker to Container Scanning in documentation. Refs ↵docs-ee-5017-rename_sast_container_to_container_scanning	Olivier Gonzalez	2018-03-15	4	-60/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-org/gitlab-ee#5017
* \| \| \| \| \| \| \| \| \|	Merge branch 'revert-feb95ce3' into 'master'	Grzegorz Bizon	2018-03-16	2	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'update-httparty' into 'master'" See merge request gitlab-org/gitlab-ce!17789
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'update-httparty' into 'master'"	Stan Hu	2018-03-16	2	-3/+4
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !17737
* \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.5.5	Ian Baum	2018-03-15	6	-25/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'docs-new-fe-guide-style' into 'master'	Jacob Schatz	2018-03-15	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename style to style guide in new frontend guide See merge request gitlab-org/gitlab-ce!17725
\| * \| \| \| \| \| \| \| \|	Rename style to style guide in new frontend guide	Clement Ho	2018-03-15	2	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-import-helper-spec' into 'master'	Stan Hu	2018-03-15	1	-4/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import helper spec when a previous spec stubs settings Closes gitlab-ee#5303 See merge request gitlab-org/gitlab-ce!17776
\| * \| \| \| \| \| \| \|	Fix import helper spec when a previous spec stubs settings	Sean McGivern	2018-03-15	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should use stub_omniauth_setting, not do it manually.
* \| \| \| \| \| \| \| \|	Merge branch 'jivl-realtime-update-adding-file' into 'master'	Phil Hughes	2018-03-15	3	-0/+52
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add realtime pipeline status component for files Closes #42927 See merge request gitlab-org/gitlab-ce!17705
\| * \| \| \| \| \| \| \| \|	Include feature spec for realtime pipelinejivl-realtime-update-adding-file	Mayra Cabrera	2018-03-14	1	-9/+18
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add realtime pipeline status component for files	Jose Ivan Vargas	2018-03-14	3	-0/+43
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' ↵	Stan Hu	2018-03-15	7	-18/+57
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Reduce Redis usage from merge request diffs caching" Closes #44191 See merge request gitlab-org/gitlab-ce!17746