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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'single-list-multiple-clusters' into 'master'	Kamil Trzciński	2017-12-12	2	-39/+0
\|\ \| \| \| \| \| \| \| \|	Use Single list for multiple clusters See merge request gitlab-org/gitlab-ce!15848
\| *	Remove tab navigation from clusters/index	Matija Čupić	2017-12-11	1	-11/+0
\| \|
\| *	Remove cluster scope from ClustersController#index	Matija Čupić	2017-12-11	1	-28/+0
\| \|
* \|	Merge branch 'rc/backport-ee-fix' into 'master'	Kamil Trzciński	2017-12-12	1	-18/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport a spec fix done in EE (5dbecb8e) to CE See merge request gitlab-org/gitlab-ce!15842
\| * \|	Backport a spec fix done in EE (5dbecb8e) to CE	Rémy Coutable	2017-12-11	1	-18/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'jprovazn-description' into 'master'	Sean McGivern	2017-12-12	3	-0/+32
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use message body for merge request description Closes #40968 See merge request gitlab-org/gitlab-ce!15839
\| * \| \|	Use message body for merge request descriptionjprovazn-description	Jan Provaznik	2017-12-11	3	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request is created from email, use message body as merge request description. If message body is empty then merge request description is still created from the source branch commit (if there is only single commit in the merge request). If message body is empty and there are multiple commits in the source branch, then merge request description is left empty. Closes #40968
* \| \| \|	Merge branch 'add-js-prefix-issuable-edit' into 'master'	Filipa Lacerda	2017-12-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add js prefix for issuable-edit Closes #40965 See merge request gitlab-org/gitlab-ce!15813
\| * \| \| \|	Add js prefix for issuable-editadd-js-prefix-issuable-edit	Clement Ho	2017-12-08	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'	Filipa Lacerda	2017-12-12	3	-165/+254
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop "ERROR: TypeError{}" from being logged to the console and fail tests Closes #37619 See merge request gitlab-org/gitlab-ce!15830
\| * \| \| \| \|	Use shared interceptor in note specs37619-fix-vue-typeerror-not-failing-the-build	Eric Eastwood	2017-12-11	2	-205/+215
\| \| \| \| \| \|
\| * \| \| \| \|	Try to clean up legit Vue error that was patched over	Eric Eastwood	2017-12-10	2	-22/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
\| * \| \| \| \|	Add Vue errorHandlor to remove rogue logged TypeErrors	Eric Eastwood	2017-12-10	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
* \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-12-12	1	-0/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build' into 'master' Job dropping by MissingDependenciesError should consider StaleObjectError Closes #41023 See merge request gitlab-org/gitlab-ce!15873
\| * \| \| \| \| \|	ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build	Shinya Maeda	2017-12-12	1	-0/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '40997-pipeline-null' into 'master'	Phil Hughes	2017-12-12	1	-0/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checks for null in job tooltip title Closes #40997 See merge request gitlab-org/gitlab-ce!15869
\| * \| \| \| \| \| \|	Check for null in job tooltip title40997-pipeline-null	Filipa Lacerda	2017-12-11	1	-0/+31
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'	Tim Zallmann	2017-12-12	1	-8/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comment on image discussion icon alignment (update icons) Closes #39608 See merge request gitlab-org/gitlab-ce!15760
\| * \| \| \| \| \| \|	Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignment	Eric Eastwood	2017-12-08	1	-8/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39608 Use SVG icons to avoid having to position things See https://gitlab.com/gitlab-org/gitlab-ce/issues/39608#note_50088917
* \| \| \| \| \| \|	Merge branch 'issue-note-rename' into 'master'	Fatih Acet	2017-12-11	6	-9/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename remaining issue_ prefixed files See merge request gitlab-org/gitlab-ce!15818
\| * \| \| \| \| \| \|	rename remaining issue_ prefixed filesissue-note-rename	Simon Knox	2017-12-09	6	-9/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitaly-mirroring-prep' into 'master'	Robert Speicher	2017-12-11	1	-18/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly mirroring migration prep Closes gitaly#816 See merge request gitlab-org/gitlab-ce!15775
\| * \| \| \| \| \| \| \|	Add feature flag to use gitaly-ssh mirroring when cloning internal repos	Alejandro Rodríguez	2017-12-06	1	-18/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also allows us to simplify the naming since we can make some fetching methods private.
* \| \| \| \| \| \| \| \|	Merge branch 'backport-epic-in-issue' into 'master'	Jacob Schatz	2017-12-11	2	-24/+30
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport epic in issue See merge request gitlab-org/gitlab-ce!15799
\| * \| \| \| \| \| \| \|	Backport epic in issueepic-in-issue backport-epic-in-issue	Clement Ho	2017-12-07	2	-24/+30
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'url-utility-es-module' into 'master'	Filipa Lacerda	2017-12-11	19	-63/+68
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into 'url-utility-es-module'	Phil Hughes	2017-12-11	49	-272/+1260
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issue_show/components/app.vue
\| * \| \| \| \| \| \| \| \|	fix missed gl.utils.visitUrl spy	Phil Hughes	2017-12-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	remove utl util imports from boards specs	Phil Hughes	2017-12-08	3	-3/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	use exported methods instead of gl.utils	Phil Hughes	2017-12-08	16	-58/+66
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '35724-animate-sidebar' into 'master'	Filipa Lacerda	2017-12-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797
\| * \| \| \| \| \| \| \| \| \|	Animate contextual sidebar; change class names for easier readability	Annabel Dunstone Gray	2017-12-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-remove-column-cop' into 'master'	Rémy Coutable	2017-12-11	1	-0/+68
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cop for use of remove_column See merge request gitlab-org/gitlab-ce!15855
\| * \| \| \| \| \| \| \| \| \| \|	Add cop for use of remove_columnadd-remove-column-cop	Sean McGivern	2017-12-11	1	-0/+68
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove_column should only be used in the up (or change) step of a migration if it's a post-deployment migration. Otherwise there will be downtime due to the ActiveRecord column cache, which we can avoid by using the IgnorableColumn concern in combination with a post-deployment migration.
* \| \| \| \| \| \| \| \| \| \|	small change to make less conflict with EE version	Brett Walker	2017-12-11	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'	Yorick Peterse	2017-12-11	2	-46/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove allocation tracking code from InfluxDB sampler for performance Closes gitlab-com/infrastructure#3250 See merge request gitlab-org/gitlab-ce!15834
\| * \| \| \| \| \| \| \| \| \| \|	Remove RubySampler#sample_objects for performance as well	Stan Hu	2017-12-11	1	-23/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove allocation tracking code from InfluxDB sampler for performancesh-remove-allocation-tracking-influxdb	Stan Hu	2017-12-10	1	-23/+0
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On GitLab.com, InfluxSampler#sample_objects appears to take 1.2 s or so to iterate through 1059 objects. This had led to delays of a couple hundred milliseconds in processing in the main thread. Remove this code since it's not really being used. Closes gitlab-com/infrastructure#3250
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove_assignee_id' into 'master'	Yorick Peterse	2017-12-11	2	-1/+38
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove issues.assignee_id column Closes #30453 See merge request gitlab-org/gitlab-ce!11637
\| * \| \| \| \| \| \| \| \| \| \|	Add spec for removing issues.assignee_id	Sean McGivern	2017-12-11	1	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This migration also needs to be a post-deployment migration, as it removes a column.
\| * \| \| \| \| \| \| \| \| \| \|	Fix specs after removing assignee_id field	Valery Sizov	2017-12-11	1	-1/+1
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-12-11	2	-0/+39
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40743-bug-accepting-new-group-members-when-permission-level-developer' into 'master' Bugfix: User can't change the access level of an access requester Closes #40743 See merge request gitlab-org/gitlab-ce!15832
\| * \| \| \| \| \| \| \| \| \|	Bugfix: User can't change the access level of an access requester	Rubén Dávila	2017-12-11	2	-0/+39
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The endpoint was returning 404 because it was only searching on the current members of a Group or Project and not the access requesters.
* \| \| \| \| \| \| \| \| \|	Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'	Winnie Hellmann	2017-12-11	7	-37/+188
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821
\| * \| \| \| \| \| \| \| \|	Merge branch 'note-preview' into 'security-10-2'	Fatih Acet	2017-12-08	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment
\| * \| \| \| \| \| \| \| \|	Merge branch 'issue_30663' into 'security-10-2'	Sean McGivern	2017-12-08	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions
\| * \| \| \| \| \| \| \| \|	Merge branch 'rs-security-group-api' into 'security-10-2'	Douwe Maan	2017-12-08	1	-0/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder
\| * \| \| \| \| \| \| \| \|	Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'	Douwe Maan	2017-12-08	2	-28/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(10.2) Avoid partial partial email adresses for matching See merge request gitlab/gitlabhq!2232 (cherry picked from commit 081aa1e91a777c9acb31be4a1e76b3dd7032fa9a) There are unresolved conflicts in app/models/user.rb. fa85a3fd Don't allow searching for partial user emails
\| * \| \| \| \| \| \| \| \|	Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵	Douwe Maan	2017-12-08	2	-9/+69
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met
* \| \| \| \| \| \| \| \|	Fix image view mode	Clement Ho	2017-12-11	1	-0/+12
\| \| \| \| \| \| \| \| \|