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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove unnecessary js-issuable-editremove-unnecessary-js-issuable-edit	Clement Ho	2017-12-12	1	-1/+1
\|
*	Merge branch 'single-list-multiple-clusters' into 'master'	Kamil Trzciński	2017-12-12	6	-68/+13
\|\ \| \| \| \| \| \| \| \|	Use Single list for multiple clusters See merge request gitlab-org/gitlab-ce!15848
\| *	Remove Add Cluster button in clusters/indexsingle-list-multiple-clusters	Matija Čupić	2017-12-11	1	-2/+0
\| \|
\| *	Change copy on list header	Chris Peressini	2017-12-11	1	-1/+1
\| \|
\| *	Add CHANGELOG entry	Matija Čupić	2017-12-11	1	-0/+5
\| \|
\| *	Remove tab navigation from clusters/index	Matija Čupić	2017-12-11	3	-35/+8
\| \|
\| *	Remove cluster scope from ClustersController#index	Matija Čupić	2017-12-11	2	-33/+2
\| \|
* \|	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	5	-2/+37
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-2/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ↵	Douwe Maan	2017-12-12	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cache' into 'master' Resolve "undefined method `new_project_guidelines_html', unable to load from cache" Closes #41041 See merge request gitlab-org/gitlab-ce!15878
\| * \| \| \|	Clears the current Appearance cache otherwise it breaks since ↵41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cache	Rémy Coutable	2017-12-12	1	-0/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new_project_guidelines_html would be missing Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/41041. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'add-js-prefix-issuable-edit' into 'master'	Filipa Lacerda	2017-12-12	6	-8/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-8/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'	Filipa Lacerda	2017-12-12	4	-168/+255
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-25/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'diff-file-navigation-doc-screenshot-docs' into 'master'	Filipa Lacerda	2017-12-12	1	-0/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated image for diff navigation docs See merge request gitlab-org/gitlab-ce!15875
\| * \| \| \| \| \|	Updated image for diff navigation docsdiff-file-navigation-doc-screenshot-docs	Phil Hughes	2017-12-12	1	-0/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-image-blob-diff-full-url' into 'master'	Sean McGivern	2017-12-12	6	-21/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use app host instead of asset host when rendering image blob or diff Closes #41002 See merge request gitlab-org/gitlab-ce!15854
\| * \| \| \| \| \| \|	Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-url	Douwe Maan	2017-12-12	6	-21/+39
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-12-12	2	-8/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	2	-8/+22
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '40997-pipeline-null' into 'master'	Phil Hughes	2017-12-12	2	-11/+61
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-11/+61
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'milestone-sidebar-docs' into 'master'	Sean McGivern	2017-12-12	3	-4/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestone sidebar docs See merge request gitlab-org/gitlab-ce!15861
\| * \| \| \| \| \| \| \| \|	Milestone sidebar docs	Victor Wu	2017-12-12	3	-4/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-remove-branch-name-migration' into 'master'	Sean McGivern	2017-12-12	2	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration that removes issues.branch_name See merge request gitlab-org/gitlab-ce!15858
\| * \| \| \| \| \| \| \| \|	Fix migration that removes issues.branch_namefix-remove-branch-name-migration	Yorick Peterse	2017-12-11	2	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-i18n-placeholder-names' into 'master'	Tim Zallmann	2017-12-12	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify casing of I18N placeholder names See merge request gitlab-org/gitlab-ce!15867
\| * \| \| \| \| \| \| \| \| \|	Clarify casing of I18N placeholder nameswinh-i18n-placeholder-names	Winnie Hellmann	2017-12-11	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'	Tim Zallmann	2017-12-12	15	-47/+34
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	15	-47/+34
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	13	-36/+36
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	13	-36/+36
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master'	Stan Hu	2017-12-11	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore temporary table in schema Closes #40976 See merge request gitlab-org/gitlab-ce!15866
\| * \| \| \| \| \| \| \| \| \| \|	Ignore temporary table in schema	Michael Kozono	2017-12-11	2	-0/+7
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-mirroring-prep' into 'master'	Robert Speicher	2017-12-11	4	-55/+46
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly mirroring migration prep Closes gitaly#816 See merge request gitlab-org/gitlab-ce!15775
\| * \| \| \| \| \| \| \| \| \| \|	Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prep	Alejandro Rodríguez	2017-12-06	3	-19/+20
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add feature flag to use gitaly-ssh mirroring when cloning internal repos	Alejandro Rodríguez	2017-12-06	3	-38/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	11	-82/+151
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	11	-82/+151
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix_js_style_guide_markup' into 'master'	Rémy Coutable	2017-12-11	1	-62/+60
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes some markup issues in the js style guide docs See merge request gitlab-org/gitlab-ce!15828
\| * \| \| \| \| \| \| \| \| \| \|	fixes some markup issues in the js style guide docs	Christiaan Van den Poel	2017-12-11	1	-62/+60
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'url-utility-es-module' into 'master'	Filipa Lacerda	2017-12-11	50	-188/+188
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783
\| * \| \| \| \| \| \| \| \| \| \|	updated importsurl-utility-es-module	Phil Hughes	2017-12-11	14	-29/+29
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'url-utility-es-module'	Phil Hughes	2017-12-11	143	-1094/+2820
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issue_show/components/app.vue
\| * \| \| \| \| \| \| \| \| \| \| \|	fix missed gl.utils.visitUrl spy	Phil Hughes	2017-12-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|