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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Fix #48537 - Update avatar only via the projects API	Jamie Schembri	2018-07-09	1	-1/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '42415-omit-projects-from-get-group-endpoint' into 'master'	Douwe Maan	2018-07-10	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API: /groups/:name query very slow for groups with many projects" Closes #42415 See merge request gitlab-org/gitlab-ce!20494
\| * \| \| \| \| \| \| \|	Adds with_projects optional parameter to /groups/:id API endpoint	Tiago Botelho	2018-07-09	1	-1/+2
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Support manually stopping any environment from the UI	Winnie Hellmann	2018-07-10	1	-1/+2
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-rubocop'	Sean McGivern	2018-07-09	52	-176/+153
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove useless return	Lin Jen-Shin	2018-07-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Resolve Naming/UncommunicativeMethod	Lin Jen-Shin	2018-07-09	18	-132/+132
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use stable gitlab-styles and eliminate offenses	Lin Jen-Shin	2018-07-09	2	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updates from `rubocop -a`	Lin Jen-Shin	2018-07-09	34	-42/+20
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gitaly-update-branch' into 'master'	Robert Speicher	2018-07-09	2	-1/+23
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly's OperationService.UserUpdateBranch RPC Closes gitaly#1252 See merge request gitlab-org/gitlab-ce!20231
\| * \| \| \| \| \|	Use Gitaly's OperationService.UserUpdateBranch RPC	Alejandro Rodríguez	2018-07-08	2	-1/+23
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'jprovazn-upload-symlink' into 'master'	Kamil Trzciński	2018-07-09	2	-3/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add FileUploader.root to allowed upload paths Closes gitlab-qa#291 See merge request gitlab-org/gitlab-ce!20472
\| * \| \| \| \| \|	Added test and used Array() instead of .wrap	Jan Provaznik	2018-07-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add FileUploader.root to allowed upload paths	Jan Provaznik	2018-07-08	2	-3/+4
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we check if uploaded file is under `Gitlab.config.uploads.storage_path`, the problem is that uploads are placed in `uploads` subdirectory which is symlink. In allow_path? method we check real (expanded) paths, which causes that `Gitlab.config.uploads.storage_path` is expaned into symlink path and there is a mismatch with upload file path. By adding `Gitlab.config.uploads.storage_path/uploads` into allowed paths, this path is expaned during path check. `Gitlab.config.uploads.storage_path` is left there intentionally in case some uploader wouldn't use `uploads` subdir.
* \| \| \| \| \|	Merge branch 'sh-fix-issue-47797-ce' into 'master'	Douwe Maan	2018-07-09	1	-0/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix handling of annotated tags when Gitaly is not in use Closes #47797 See merge request gitlab-org/gitlab-ce!20497
\| * \| \| \| \|	Fix handling of annotated tags when Gitaly is not in use	Stan Hu	2018-07-09	1	-0/+5
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempting to view an annotated tag in the TreeController would result in `NoMethodError: undefined method 'tree'` when Rugged was in use. `Blob#find_by_rugged` assumes that the ref is a true. Using the commit ID ensures that the right ref is being used. Note that in 11.1, `Blob#find` no longer uses Rugged, so this is only a bug in 11.0. Closes gitlab-org/gitlab-ce#47797
* \| \| \| \|	Merge branch ↵	Yorick Peterse	2018-07-09	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace' into 'master' Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace" Closes #48976 See merge request gitlab-org/gitlab-ce!20462
\| * \| \| \| \|	[Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass ↵	blackst0ne	2018-07-07	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace'
* \| \| \| \| \|	Merge branch 'bvl-gettext-updated-check-fix-ce' into 'master'	Sean McGivern	2018-07-09	1	-7/+23
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates to the `gettext:updated_check` Closes #48952 See merge request gitlab-org/gitlab-ce!20433
\| * \| \| \| \|	Update `gettext:updated_check` regenerate pot file	Bob Van Landuyt	2018-07-09	1	-7/+23
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Making the `gettext:updated_check` by completely regenerating the gitlab.pot. This avoids an issue where `gettext:find` would not pick up on changes if the file isn't removed first.
* \| \| \| \|	Merge branch '48978-fix-helm-installation-on-cluster' into 'master'	Kamil Trzciński	2018-07-09	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Installing Helm Tiller Failing" Closes #48978 See merge request gitlab-org/gitlab-ce!20471
\| * \| \| \| \|	Include wget in apk add command	Mayra Cabrera	2018-07-08	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #48978
* \| \| \| \|	Make blob and other RPC's mandatory	Jacob Vosmaer (GitLab)	2018-07-09	3	-140/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gitaly-mandatory-20180706-jv' into 'master'	Douwe Maan	2018-07-09	4	-77/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitaly_list_commits_by_oid, gitaly_commit_deltas, gitaly_create_repository flags Closes gitaly#593, gitaly#566, and gitaly#670 See merge request gitlab-org/gitlab-ce!20432
\| * \| \| \| \|	Make more things mandatory	Jacob Vosmaer	2018-07-06	4	-77/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-diff-mandatory' into 'master'	Grzegorz Bizon	2018-07-09	3	-24/+12
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make all Gitaly diff flags mandatory Closes gitaly#528 and gitaly#222 See merge request gitlab-org/gitlab-ce!20424
\| * \| \| \| \|	Make all Gitaly diff flags mandatory	Jacob Vosmaer	2018-07-06	3	-24/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Improve render performance of large wiki pages	Peter Leitzen	2018-07-07	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Compile often used regexps only once outside of the loop. This commit improves the performance of large wiki pages with many, many references.
* \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-07-07	1	-4/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48670-application-settings-may-not-be-invalidated-if-migrations-are-run' into 'master' Resolve "Application settings may not be invalidated if migrations are run" Closes #48670 See merge request gitlab-org/gitlab-ce!20389
\| * \| \| \| \| \|	Stop relying on migrations in the CacheableAttributes cache key and cache ↵	Rémy Coutable	2018-07-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attributes for 1 minute instead Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Refactor rspec matchers in read_only_spec.rb	Brett Walker	2018-07-07	1	-0/+1
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵	Sean McGivern	2018-07-06	5	-15/+73
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
\| * \| \| \| \| \|	fix permissions	James Lopez	2018-07-06	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update Import/Export to use object storage (based on aa feature flag)	James Lopez	2018-07-06	5	-15/+72
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Ability to check if underlying database is read only	Brett Walker	2018-07-06	1	-0/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-set-delete-config' into 'master'	Nick Thomas	2018-07-06	2	-6/+55
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Repository#set_config and #delete_config See merge request gitlab-org/gitlab-ce!20372
\| * \| \| \| \|	Add Repository#set_config and #delete_config	Jacob Vosmaer	2018-07-06	2	-6/+55
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'build-chunks-on-object-storage' into 'master'	Grzegorz Bizon	2018-07-06	1	-0/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to store BuildTraceChunks on Object Storage Closes #45712 See merge request gitlab-org/gitlab-ce!19515
\| * \ \ \ \	Merge branch 'master' into build-chunks-on-object-storage	Shinya Maeda	2018-07-06	28	-134/+210
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into build-chunks-on-object-storage	Shinya Maeda	2018-07-04	7	-310/+62
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Add spec for ExclusiveLeaseHelpers	Shinya Maeda	2018-07-03	1	-0/+29
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitaly-conflicts-find-commit' into 'master'	Douwe Maan	2018-07-06	2	-77/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially revert "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"" See merge request gitlab-org/gitlab-ce!20422
\| * \| \| \| \| \| \| \|	Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into ↵	Jacob Vosmaer	2018-07-06	2	-77/+6
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'"" This partially reverts commit 64dfe2cba1594b67e56233230be8137fa0afacf9.
* \| \| \| \| \| \| \|	Merge branch 'ide-merge-request-info' into 'master'	Sean McGivern	2018-07-06	2	-1/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added merge request info to Web IDE sidebar Closes #45187 See merge request gitlab-org/gitlab-ce!19860
\| * \| \| \| \| \| \|	added API docs	Phil Hughes	2018-07-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG improved comments in API code improved spec description
\| * \| \| \| \| \| \|	karma & rubocop fixes	Phil Hughes	2018-07-05	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	only include _html fields when asked for	Phil Hughes	2018-07-05	2	-7/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	added html to response	Phil Hughes	2018-07-05	1	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'	Douwe Maan	2018-07-06	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Undefined omniauth_authorize_path when omniauth_enabled not enabled" Closes #48677 See merge request gitlab-org/gitlab-ce!20302
\| * \| \| \| \| \| \|	If `omniauth_auto_sign_in_with_provider` is set,	Lin Jen-Shin	2018-07-02	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it also means we're using omniauth, so we need to set it up.