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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 '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 '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	6	-3/+137
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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 '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 '38032-deploy-markers-should-be-more-verbose' into 'master'	Mike Greiling	2017-12-08	3	-3/+46
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Deploy markers should be more verbose" Closes #38032 See merge request gitlab-org/gitlab-ce!15641
\| * \| \|	Changed the deploy markers on the prometheus dashboard to be more verbose	Jose Ivan Vargas	2017-12-07	3	-3/+46
\| \| \| \|
* \| \| \|	Resolve "No feedback when checking on checklist if potential spam was detected"	Luke Bennett	2017-12-08	3	-0/+91
\| \|_\|/ \|/\| \|
* \| \|	Merge branch '40825-use-relative-path-urls' into 'master'	Robert Speicher	2017-12-07	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative _path helper URLs in the GitLab UI Closes #40825 See merge request gitlab-org/gitlab-ce!15738
\| * \| \|	Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urls	Eric Eastwood	2017-12-07	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* \| \|	Merge branch 'fix-transient-datefix-spec' into 'master'	Jacob Schatz	2017-12-07	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transient error in pikadayToString Closes #40858 See merge request gitlab-org/gitlab-ce!15754
\| * \|	Fix transient error in pikadayToStringfix-transient-datefix-spec	Clement Ho	2017-12-05	1	-1/+1
\| \| \|
* \| \|	Fixed remove deploy key loading icon not being removed after cancelingdeploy-keys-loading-icon	Phil Hughes	2017-12-07	2	-1/+15
\| \|/ \|/\| \| \| \| \|	Closes #37595
* \|	Merge branch '35773-search-box-close-dropdown' into 'master'	Annabel Dunstone Gray	2017-12-06	1	-2/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Close all open dropdowns when search input is clicked Closes #35773 See merge request gitlab-org/gitlab-ce!15737
\| * \|	Updates the dropdown to match the docs and remove old hack of stop event ↵35773-search-box-close-dropdown	Filipa Lacerda	2017-12-06	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|	propagation
* \| \|	Export template selector as ES6 modules	Filipa Lacerda	2017-12-06	2	-10/+1
\| \| \|
* \| \|	Merge branch '40543-generalize-detail-page-headers' into 'master'	Phil Hughes	2017-12-06	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generalize detail page headers (Issues, Merge Requests, Snippets) Closes #40543 See merge request gitlab-org/gitlab-ce!15639
\| * \| \|	Generalize detail page headers40543-generalize-detail-page-headers	Eric Eastwood	2017-12-05	1	-2/+2
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40543 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15192
* \| \|	Merge remote-tracking branch 'origin/master' into list-multiple-clusters	Kamil Trzcinski	2017-12-05	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge branch '32878-merge-request-from-email' into 'master'	Sean McGivern	2017-12-05	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create merge request from email Closes #32878 See merge request gitlab-org/gitlab-ce!13817
\| \| * \|	Create merge request from email	Jan Provaznik	2017-12-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* new merge request can be created by sending an email to the specific email address (similar to creating issues by email) * for the first iteration, source branch must be specified in the mail subject, other merge request parameters can not be set yet * user should enable "Receive notifications about your own activity" in user settings to receive a notification about created merge request Part of #32878
* \| \| \|	Merge branch '35616-move-k8-to-cluster-page' into ↵	Kamil Trzcinski	2017-12-05	11	-64/+152
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \|	cluster-page-with-list-clusters
\| * \| \|	Second iteration of Move Kubernetes from service to Cluster page	Filipa Lacerda	2017-12-05	1	-1/+15
\| \| \| \|
\| * \| \|	Merge branch 'ce-1379-update-sidebar-weight-to-vue-and-add-to-boards' into ↵	Phil Hughes	2017-12-05	4	-14/+107
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Backport EE changes from refactor sidebar weight block Vue and move to Issue Boards See merge request gitlab-org/gitlab-ce!15706
\| \| * \| \|	Backport changes from refactor sidebar weight block Vue and move to Issue Boardsce-1379-update-sidebar-weight-to-vue-and-add-to-boards	Eric Eastwood	2017-12-04	4	-14/+107
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3566
\| * \| \|	Merge branch '40739-access-404' into 'master'	Grzegorz Bizon	2017-12-05	1	-35/+30
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent job link form rendering when user does not have permissions Closes #40739 See merge request gitlab-org/gitlab-ce!15723
\| \| * \|	Prevent job link form rendering when user does not have permissions40739-access-404	Filipa Lacerda	2017-12-04	1	-35/+30
\| \| \|/ \| \| \| \| \| \| \| \| \|	Adds e2e tests
\| * \|	issue note component rename	Simon Knox	2017-12-04	6	-15/+15
\| \|/
* \|	Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵	Kamil Trzcinski	2017-12-03	4	-1/+165
\|\ \ \| \| \| \| \| \| \| \| \|	cluster-page-with-list-clusters
\| * \|	Fix show page toggle	Filipa Lacerda	2017-11-29	1	-1/+1
\| \| \|
\| * \|	Fix broken specs	Filipa Lacerda	2017-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Don't add disabled class to loading button
\| * \|	Changes after Frontend and UX review:	Filipa Lacerda	2017-11-28	2	-9/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Moves toggle button to a shared location - Adds tests for toggle button - Transforms Clusters class into function - Improves UX
\| * \|	Adds JS unit tests	Filipa Lacerda	2017-11-27	2	-16/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Finishes tabs & table Updates e2e tests
\| * \|	Handle toggle button with API request	Filipa Lacerda	2017-11-24	2	-3/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests Update empty state [ci skip]
\| * \|	Merge branch 'master' into list-multiple-clusters	Filipa Lacerda	2017-11-24	13	-241/+299
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (53 commits) Updated timeago.js Prevent 500 error when inspecting job after trigger was removed Add classList polyfill for IE classList.toggle(.., force) Use feature flag instead of application settigns to control if method calls should be instrumented Rename wip to worker_id add missing schema entry and application settigns helper Use only real duration to measure method call performance via Prometheus check method timing threshold when observing method performance Add changelog for #15558 Reenable prometheus metrics Move prometheus middle ware to prometheus initialized. Fix WIP system note not being created Update CHANGELOG.md for 10.2.2 Fix hashed storage for attachments bugs Rename fetch_refs to refmap Clean up repository fetch and mirror methods Fix pulling and pushing using a personal access token with the sudo scope Allow password authentication to be disabled entirely Simplify the DB changes checklist Added Rubocop config for background migrations ...