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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ce-11430-update_clair_local_scan' into 'master'	James Lopez	2019-05-07	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Bump clair-local-scan to v2.0.8 See merge request gitlab-org/gitlab-ce!27977
\| *	Bump clair-local-scan to v2.0.8	Olivier Gonzalez	2019-05-07	2	-1/+6
\|/
*	Merge branch 'show-disabled-mirrors' into 'master'	Nick Thomas	2019-05-07	8	-15/+58
\|\ \| \| \| \| \| \| \| \|	CE Show disabled project repo mirrors See merge request gitlab-org/gitlab-ce!27326
\| *	Show disabled project repo mirrorsshow-disabled-mirrors	Luke Bennett	2019-05-07	8	-15/+58
\| \| \| \| \| \| \| \| \| \|	Show disabled mirrors with a badge so that they can be deleted by project owners.
* \|	Merge branch 'quarantine-login-via-oauth-spec' into 'master'	Lin Jen-Shin	2019-05-07	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine login via oauth spec See merge request gitlab-org/gitlab-ce!28176
\| * \|	Quarantine login via oauth spec	Walmyr Lima	2019-05-07	1	-1/+2
\| \| \|
* \| \|	Merge branch 'patch-17' into 'master'	Bob Van Landuyt	2019-05-07	2	-5/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove note that multi-line suggestions are not yet available See merge request gitlab-org/gitlab-ce!28119
\| * \| \|	add changelog entry	Simon Hardt	2019-05-07	1	-0/+5
\| \| \| \|
\| * \| \|	remove note that multi-line suggestions are not yet available	Simon Hardt	2019-05-06	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|	(#53310 is now done)
* \| \| \|	Merge branch 'fj-59522-improve-search-controller-performance' into 'master'	James Lopez	2019-05-07	14	-113/+182
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of the global search for issuables Closes #59522 See merge request gitlab-org/gitlab-ce!27817
\| * \| \|	Add improvements to the global search process	Francisco Javier López	2019-05-07	14	-113/+182
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the conditions added to Project.with_feature_available_for_user, and moved to the IssuableFinder. Now, we ensure that, in the projects retrieved in the Finder, the user has enough access for the feature.
* \| \|	Merge branch 'patch-17' into 'master'	Bob Van Landuyt	2019-05-07	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc/ci: include local: remove superfluous ":" See merge request gitlab-org/gitlab-ce!28112
\| * \| \|	include local: remove superfluous ":"	Elan Ruusamäe	2019-05-06	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'bvl-fix-ordering-mysql' into 'master'	Sean McGivern	2019-05-07	1	-5/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set created_at and updated_at for sorting specs Closes #61541 See merge request gitlab-org/gitlab-ce!28173
\| * \| \| \|	Set created_at and updated_at for sorting specs	Bob Van Landuyt	2019-05-07	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes sure that the results are predictable and the same on both Postgres and MySQL
* \| \| \| \|	Merge branch 'docs/fix-source-install-git' into 'master'	Bob Van Landuyt	2019-05-07	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix installation from source See merge request gitlab-org/gitlab-ce!28170
\| * \| \| \| \|	Fix installation from source	Dmitriy Zaporozhets	2019-05-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Compiling git has a wrong symbol that leads into invalid command
* \| \| \| \| \|	Merge branch 'gitaly-version-v1.42.0' into 'master'	Douwe Maan	2019-05-07	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.42.0 See merge request gitlab-org/gitlab-ce!28135
\| * \| \| \| \| \|	Upgrade Gitaly to v1.42.0	GitalyBot	2019-05-07	2	-1/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'dz-registry-proxy-ui-ce' into 'master'	Tim Zallmann	2019-05-07	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport for Dependency Proxy UI See merge request gitlab-org/gitlab-ce!27965
\| * \| \| \| \| \|	Backport change to group sidebardz-registry-proxy-ui-ce	mfluharty	2019-05-01	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-cleanup-import-export' into 'master'	James Lopez	2019-05-07	3	-4/+37
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up CarrierWave's import/export files Closes #60656 See merge request gitlab-org/gitlab-ce!27487
\| * \| \| \| \| \| \|	Clean up CarrierWave's import/export files	Stan Hu	2019-05-07	3	-4/+37
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unlike uploads that have been uploaded with Tempfile, the project import/export archives are stored in a temporary cache directory and remain there if: 1. Object storage is enabled 2. `move_to_store` is set to `true`. CarrierWave will leave these files there until disk space runs out or a clean step is run manually. If `move_to_store` is set to `false`, CarrierWave will remove the files after storing them. However, unlike a local file, with object storage, the file is still copied, so setting `move_to_store` to `true` doesn't buy us anything. To ensure files are cleaned up, we can just inherit from the GitlabUploader implementation of `move_to_store`, which returns `true` if it's a local file, `false` otherwise. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60656
* \| \| \| \| \| \|	Merge branch 'friendly-wrap-component' into 'master'	Tim Zallmann	2019-05-07	2	-0/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add wbr style for IE11 compatibility See merge request gitlab-org/gitlab-ce!27846
\| * \| \| \| \| \|	Add wbr style for IE11 compatibilityfriendly-wrap-component	Paul Gascou-Vaillancourt	2019-05-06	2	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '59930-todos-scss' into 'master'	Phil Hughes	2019-05-07	2	-35/+28
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleans up todos.scss style-lint warnings Closes #59930 See merge request gitlab-org/gitlab-ce!28076
\| * \| \| \| \| \| \|	Cleans up todos.scss stylelint warnings59930-todos-scss	Filipa Lacerda	2019-05-03	2	-35/+28
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-separate-frontend-fixtures' into 'master'	Phil Hughes	2019-05-07	8	-10/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport) See merge request gitlab-org/gitlab-ce!28032
\| * \| \| \| \| \| \| \|	Load EE fixtures from ee/ directory in Jestwinh-separate-frontend-fixtures	Winnie Hellmann	2019-05-02	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 2917a28a885922a03f2026ddbb2680bc2b6e5d50)
\| * \| \| \| \| \| \| \|	Load EE fixtures from ee/ directory in Karma	Winnie Hellmann	2019-05-02	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 7cde57bf7367bce130a2e7f149c8dafd362de3f8)
\| * \| \| \| \| \| \| \|	Generate EE frontend fixtures into ee/ directory	Winnie Hellmann	2019-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit d4ce3c720ecb52f2a9153133bbd47fa358c5d7b6)
\| * \| \| \| \| \| \| \|	Allow to override Gitlab.ee? with IS_GITLAB_EE	Winnie Hellmann	2019-05-02	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit f3b74d59865a88be67663339447667c725961413)
\| * \| \| \| \| \| \| \|	Ignore PDF and balsamiq fixture files	Winnie Hellmann	2019-05-02	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 1b33828811897b6a3f8a38044cc0839b87098d1f)
* \| \| \| \| \| \| \| \|	Merge branch '61278-next' into 'master'	Phil Hughes	2019-05-07	3	-5/+23
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only renders Next badge for gitlab.com Closes #61278 See merge request gitlab-org/gitlab-ce!28056
\| * \| \| \| \| \| \| \|	Only renders Next badge for gitlab.com	Filipa Lacerda	2019-05-07	3	-5/+23
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'allow-replying-to-individual-notes-from-api' into 'master'	James Lopez	2019-05-07	5	-11/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow replying to an individual note in the API Closes #61392 See merge request gitlab-org/gitlab-ce!28120
\| * \| \| \| \| \| \| \|	Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-api	Sean McGivern	2019-05-06	5	-11/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you can do this in the UI, you should be able to do it in the API. If a discussion is not a single note discussion, or it is replyable, you can reply to it.
* \| \| \| \| \| \| \| \|	Merge branch 'strip-attr-cron-in-pipeline-schedule' into 'master'	Grzegorz Bizon	2019-05-07	2	-0/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip whitespace for PipelineSchedule#cron See merge request gitlab-org/gitlab-ce!27990
\| * \| \| \| \| \| \| \| \|	Strip whitespace for PipelineSchedule#cronstrip-attr-cron-in-pipeline-schedule	Fabio Pitino	2019-05-02	2	-0/+12
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'instance_level_clusters' into 'master'	Bob Van Landuyt	2019-05-07	39	-45/+1109
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instance level k8s clusters See merge request gitlab-org/gitlab-ce!27196
\| * \| \| \| \| \| \| \| \| \|	Remove duplicate clusterable presenter methodinstance_level_clusters	James Fargher	2019-05-07	5	-26/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Convert instance level clusters enabled to class method	James Fargher	2019-05-07	3	-7/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Change specs to match gitlab code standards	James Fargher	2019-05-07	3	-19/+23
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Stop using `go` function in clusters controller specs	James Fargher	2019-05-07	1	-54/+54
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Check instance cluster feature at policy level	James Fargher	2019-05-07	10	-36/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try to simplify feature flag checks by using policies
\| * \| \| \| \| \| \| \| \| \|	Allow projects to use instance level clusters	James Fargher	2019-05-07	7	-11/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are two cluster hierarchies one for the deployment platform and one for controllers. The main difference is that deployment platforms do not check user permissions and only return the first match.
\| * \| \| \| \| \| \| \| \| \|	Instance level kubernetes clusters admin	James Fargher	2019-05-07	27	-5/+969
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-activerecord-patch-mark2' into 'master'	Stan Hu	2019-05-07	3	-11/+37
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Additional fix to handle NULL lock_version See merge request gitlab-org/gitlab-ce!28153
\| * \| \| \| \| \| \| \| \| \| \|	Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2	Stan Hu	2019-05-06	3	-11/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the UI sends a string value for lock_version (e.g. "0"), then the previous monkey patch did not properly handle that properly. This commit casts the value to an integer to determine whether to look for NULL lock_versions. For merge requests, GitLab sends a POST request to `namespace/project/merge_requests/:iid` with the `merge_request[lock_version]` parameter with a string `0`. The string value comes from the form field, which explains why https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28145 wasn't sufficient.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-ldap-members-icon-ce' into 'master'	Kushal Pandya	2019-05-07	2	-4/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport members SCSS changes See merge request gitlab-org/gitlab-ce!28115