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

	Commit message (Collapse)	Author	Age	Files	Lines
*	WIP: Raise more descriptive errors when URLs are blocked	Douwe Maan	2018-03-28	1	-3/+3
\|
*	Merge branch 'jprovazn-issueref' into 'master'	Douwe Maan	2018-03-23	1	-0/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix issuable state indicator Closes gitlab-ee#4683 See merge request gitlab-org/gitlab-ce!17878
\| *	Fix issuable state indicator	Jan Provaznik	2018-03-23	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the issuable reference check works only in project scope, if we reference an issuable from a non-project resource (e.g. epics), then project is not set, and there is mismatch in generated issue references. This patch enables issuable reference state check also from group scope. Closes gitlab-ee#4683 Related to #30916
* \|	Merge branch '43771-improve-avatar-error-message' into 'master'	Sean McGivern	2018-03-23	3	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Indicate supported image formats in avatar error" Closes #43771 See merge request gitlab-org/gitlab-ce!17747
\| * \|	Change avatar error message to include allowed file formats	Fabian Schneider	2018-03-22	3	-3/+3
\| \| \|
* \| \|	Merge branch ↵	Kamil Trzciński	2018-03-23	1	-3/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information' into 'master' Resolve "Enabling Auto DevOps on an empty project gives you wrong information" Closes #43482 See merge request gitlab-org/gitlab-ce!17605
\| * \| \|	Use actual repo instead of stubbing method43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information	Matija Čupić	2018-03-22	1	-7/+1
\| \| \| \|
\| * \| \|	Add empty repo check before running AutoDevOps pipeline	Matija Čupić	2018-03-11	1	-3/+31
\| \|/ /
* \| \|	Merge branch 'mark-legacy-git-access' into 'master'	Sean McGivern	2018-03-23	22	-42/+63
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
\| * \| \|	Route path lookups through legacy_disk_pathmark-legacy-git-access	Jacob Vosmaer	2018-03-21	22	-42/+63
\| \| \| \|
* \| \| \|	Merge branch 'winh-deprecate-old-modal' into 'master'	Filipa Lacerda	2018-03-23	1	-3/+3
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Rename modal.vue to deprecated_modal.vue See merge request gitlab-org/gitlab-ce!17438
\| * \| \|	Rename modal.vue to deprecated_modal.vuewinh-deprecate-old-modal	Winnie Hellmann	2018-03-22	1	-3/+3
\| \| \| \|
* \| \| \|	Add read-only banner to all pages	Toon Claes	2018-03-22	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the database is in a read-only state, display a banner on each page informing the user they cannot write to that GitLab instance. Closes gitlab-org/gitlab-ce#43937.
* \| \| \|	Merge branch 'master' into 'latest-security-to-master-21-03-18'	James Lopez	2018-03-22	8	-23/+222
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile # Gemfile.lock
\| * \ \ \	Merge branch '37987-speed-up-pipeline-creation' into 'master'	Kamil Trzciński	2018-03-22	1	-0/+2
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Speed Up Pipeline Creation See merge request gitlab-org/gitlab-ce!17443
\| \| * \| \|	Add inverse_of: :pipeline for pipeline.builds (#37987)37987-speed-up-pipeline-creation	Dylan Griffith	2018-03-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This appears to reduce the number of queries in pipeline creation of gitlab-ce's .gitlab-ci.yml by 92 This also means we now need to mock this ci yaml file properly in the test because otherwise the yaml_errors stay on the object and make all the pipelines failed.
\| * \| \| \|	Merge branch 'performance-bar-position-fix' into 'master'	Filipa Lacerda	2018-03-22	1	-10/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix performance bar spacing See merge request gitlab-org/gitlab-ce!17912
\| \| * \| \| \|	fixed karmaperformance-bar-position-fix	Phil Hughes	2018-03-21	1	-10/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'jej/omniauth-initializer-refactor' into 'master'	Douwe Maan	2018-03-22	1	-0/+65
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OmniauthInitializer created to allow testing/refactoring of code from devise.rb See merge request gitlab-org/gitlab-ce!17881
\| \| * \| \| \| \|	OmniauthInitializer created to improve devise.rb	James Edwards-Jones	2018-03-20	1	-0/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should simplify refactoring and allow testing
\| * \| \| \| \| \|	Merge branch 'add-query-counts-to-profiler-output' into 'master'	Stan Hu	2018-03-22	1	-2/+22
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query counts by model to profiler output See merge request gitlab-org/gitlab-ce!17910
\| \| * \| \| \| \| \|	Add query counts by model to profiler outputadd-query-counts-to-profiler-output	Sean McGivern	2018-03-21	1	-2/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'disable-btn-mr-when-posting-comment' into 'master'	Fatih Acet	2018-03-21	1	-0/+14
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disables the button when submitting comment. Closes #39661 See merge request gitlab-org/gitlab-ce!17918
\| \| * \| \| \| \| \| \|	Adds tests	Jacob Schatz	2018-03-21	1	-0/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'ide-folder-button-path' into 'master'	Tim Zallmann	2018-03-21	1	-0/+14
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the web IDE link in tree list opening the wrong URL Closes #44477 See merge request gitlab-org/gitlab-ce!17900
\| \| * \| \| \| \| \| \|	Fixes the web IDE link in tree list opening the wrong URL	Phil Hughes	2018-03-21	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44477
\| * \| \| \| \| \| \| \|	Merge branch 'gitaly-upload-archive' into 'master'	Sean McGivern	2018-03-21	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send Gitaly payload for git-upload-archive SSH commands Closes gitaly#1092 See merge request gitlab-org/gitlab-ce!17903
\| \| * \| \| \| \| \| \| \|	Send Gitaly payload for git-upload-archive SSH commands	Alejandro Rodríguez	2018-03-21	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'ab-43887-concurrent-migration-helpers' into 'master'	Yorick Peterse	2018-03-21	1	-11/+97
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convenient use of concurrent migration helpers Closes #43887 See merge request gitlab-org/gitlab-ce!17888
\| \| * \| \| \| \| \| \| \|	Shortcut concurrent foreign key creation if already exists.ab-43887-concurrent-migration-helpers	Andreas Brandl	2018-03-20	1	-1/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #43887.
\| \| * \| \| \| \| \| \| \|	Shortcut concurrent index creation/removal if no effect.	Andreas Brandl	2018-03-20	1	-10/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Index creation does not have an effect if the index is present already. Index removal does not have an affect if the index is not present. This helps to avoid patterns like this in migrations: ``` if index_exists?(...) remove_concurrent_index(...) end ```
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'	James Lopez	2018-03-21	2	-43/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
* \| \| \| \| \| \| \| \| \|	Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'	Douwe Maan	2018-03-21	8	-8/+191
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* \| \| \| \| \| \| \| \|	Merge branch 'ide-project-avatar-identicon' into 'master'	Filipa Lacerda	2018-03-21	1	-0/+39
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes empty project avatar to identicon in the IDE Closes #44298 See merge request gitlab-org/gitlab-ce!17899
\| * \| \| \| \| \| \| \|	Changes empty project avatar to identicon in the IDE	Phil Hughes	2018-03-21	1	-0/+39
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44298
* \| \| \| \| \| \| \|	Merge branch 'update-licensee' into 'master'	Douwe Maan	2018-03-21	3	-4/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update licensee 8.7.0 -> 8.9 Closes #18077 See merge request gitlab-org/gitlab-ce!17719
\| * \| \| \| \| \| \|	Fix test failures with licensee 8.9	Pirate Praveen	2018-03-20	3	-4/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'make-ide-ce' into 'master'	Tim Zallmann	2018-03-21	46	-0/+4692
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move IDE to CE Closes #44157 See merge request gitlab-org/gitlab-ce!17887
\| * \| \| \| \| \| \|	updated file references in specs	Phil Hughes	2018-03-20	43	-428/+629
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move IDE to CE	Phil Hughes	2018-03-20	46	-0/+4491
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also makes the IDE generally available
* \| \| \| \| \| \|	Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into ↵	Clement Ho	2018-03-20	15	-22/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update spec import path for vue mount component helper See merge request gitlab-org/gitlab-ce!17880
\| * \| \| \| \| \| \|	Update spec import path for vue mount component helper	George Tsiolis	2018-03-20	15	-22/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Resolve "Loss of input text on comments after preview"	Simon Knox	2018-03-20	1	-5/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-ci-job-auto-retry' into 'master'	Grzegorz Bizon	2018-03-20	1	-0/+29
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent auto-retry AccessDenied error from stopping transition to failed See merge request gitlab-org/gitlab-ce!17862
\| * \| \| \| \| \| \|	Prevent auto-retry AccessDenied error from stopping transition to failed	Tomasz Maczukin	2018-03-20	1	-0/+29
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/sm/erase_old_trace' into 'master'	Kamil Trzciński	2018-03-20	1	-0/+22
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use update_column than write_attribute and save Closes #44366 See merge request gitlab-org/gitlab-ce!17861
\| * \| \| \| \| \| \|	Use update_column than write_attribute and savefix/sm/erase_old_trace	Shinya Maeda	2018-03-19	1	-0/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '42558-add-monitoring-no-data-empty-state' into 'master'	Phil Hughes	2018-03-20	2	-34/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Prometheus graphs have no empty state when no data is present" Closes #42558 See merge request gitlab-org/gitlab-ce!17759
\| * \| \| \| \| \| \| \|	fix tests for dahboard.vue42558-add-monitoring-no-data-empty-state	Mike Greiling	2018-03-19	2	-34/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '44280-fix-code-search' into 'master'	Sean McGivern	2018-03-20	1	-5/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search code blob sometimes shows filename and branch" Closes #44280 See merge request gitlab-org/gitlab-ce!17777