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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix up merge_reqest_tabs import/require conflictsfix-9-2-stable-conflicts-for-mr-11700	Eric Eastwood	2017-06-12	2	-12/+17
\| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12011
*	Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into ↵	Clement Ho	2017-06-12	1	-1/+55
\| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix error thrown with missing note fragment in DOM Closes #32888 See merge request !11700 Conflicts: spec/javascripts/merge_request_tabs_spec.js
*	Merge branch 'issue-boards-label-filtering' into 'master'	Filipa Lacerda	2017-06-08	1	-0/+10
\| \| \| \| \| \| \|	Fixed issue boards not filtering when URL params are encoded Closes #32084 See merge request !11320
*	Merge branch ↵	Fatih Acet	2017-06-08	1	-2/+35
\| \| \| \| \| \| \| \| \|	'32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558
*	Merge branch ↵	Fatih Acet	2017-06-08	1	-0/+37
\| \| \| \| \| \| \| \| \|	'32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
*	Merge branch 'bvl-security-9-2-28917-contain-uploads-in-system-dir' into ↵	Douwe Maan	2017-05-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|	'security-9-2' (security-9-2) Upload files into `public/upload/system` instead of `public/upload` See merge request !2104 Conflicts: app/validators/dynamic_path_validator.rb Fixed conflicts based on 3c7c859c359bf5d3955dd300d6861ff33af21ca7
*	Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'	Timothy Andrew	2017-05-31	1	-0/+39
\| \| \| \| \|	Escapes html content before appending it to the DOM See merge request !2107
*	Merge branch '32170-assignees-spinner' into 'master'	Phil Hughes	2017-05-25	2	-0/+17
\| \| \| \| \| \| \|	show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434
*	Merge branch 'sentry-clientside-releases' into 'master'	Phil Hughes	2017-05-24	2	-32/+30
\| \| \| \| \| \| \|	Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565
*	Merge branch 'acet-fix-mr-widget-state' into 'master'	Douwe Maan	2017-05-24	1	-6/+6
\| \| \| \| \| \| \|	Change order of if blocks to determine widget state properly. Closes #32550 See merge request !11668
*	Merge branch '32536-mr-widget-performance-improvements' into 'master'	Fatih Acet	2017-05-23	1	-2/+0
\| \| \| \| \|	Load improvements related to MR widget See merge request !11518
*	Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'	Filipa Lacerda	2017-05-19	1	-1/+1
\| \| \| \| \| \| \|	Refine MR widget styling for buttons and info text Closes #32595 See merge request !11548
*	Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵	Filipa Lacerda	2017-05-19	1	-0/+1
\| \| \| \| \| \| \| \| \|	into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532
*	Merge branch '32074-failed-build' into 'master'	Phil Hughes	2017-05-19	2	-102/+233
\| \| \| \| \| \| \|	Fix broken test - load correct data Closes #32074 See merge request !11237
*	Merge branch 'fix-search-not-highlighting' into 'master'	Filipa Lacerda	2017-05-19	1	-4/+24
\| \| \| \| \| \| \| \|	Fixed search terms not highlight Closes #31997 See merge request !11198
*	Merge branch '32021-job-component-test-failure' into 'master'	Fatih Acet	2017-05-19	1	-28/+46
\| \| \| \| \| \| \|	Fix test failure in job vue componenFix test failure in job vue componentt Closes #32021 See merge request !11208
*	Merge branch 'pipeline-schedules-callout-docs-url' into 'master'	Filipa Lacerda	2017-05-19	1	-0/+15
\| \| \| \| \| \| \|	Set correct docsUrl in pipeline schedules callout component. Closes #31957 See merge request !11216
*	Fix 9.2 conflicts for "Polish UI on pipeline schedules form"	Timothy Andrew	2017-05-19	1	-42/+0
\|
*	Merge branch '30286-ci-badge-component' into 'master'	Phil Hughes	2017-05-19	4	-5/+103
\| \| \| \| \| \| \|	Uniform CI status components in vue Closes #30286 See merge request !11235
*	Merge branch '9-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 9-2-stable	kushalpandya	2017-05-19	1	-8/+93
\|\
\| *	Merge branch '32425-fix-diff-notes-instant-editing' into 'master'	Phil Hughes	2017-05-19	1	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ability to edit diff notes multiple times Closes #32425 See merge request !11456
\| *	Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵	Phil Hughes	2017-05-19	1	-8/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472
* \|	Merge branch 'acet-mr-widget-fix-link' into 'master'	Filipa Lacerda	2017-05-19	2	-5/+12
\|/ \| \| \| \|	MRWidget: Fix target branch link. See merge request !11267
*	Merge branch 'disable-clicking-disabled-clipboard-button' into 'master'	Phil Hughes	2017-05-19	1	-4/+27
\| \| \| \| \| \| \|	Fix clicking disabled clipboard button toolip Closes #32518 See merge request !11493
*	Initial render of issue title & description	Phil Hughes	2017-05-18	1	-0/+5
\| \| \| \|	Instead of wait for Vue for data which can cause a flash of no content depending on how quickly the API returns data. This renders the data with HAML & then passes this over to Vue to render
*	Merge branch '32178-prevent-merge-on-sha-change' into 'master'	Fatih Acet	2017-05-18	3	-0/+41
\| \| \| \| \| \| \|	Add "SHA mismatch" state to the MR widget Closes #32178 See merge request !11316
*	Merge branch '32016-escape-instant-comments-and-slash-commands' into 'master'	Douwe Maan	2017-05-18	1	-4/+42
\| \| \| \| \| \| \|	Improve slash command stripping, escape temporary note contents Closes #32016 See merge request !11341
*	Merge branch '31053-pipeline-ux' into 'master'	Fatih Acet	2017-05-18	2	-0/+67
\| \| \| \| \| \| \|	Adds left connector class to the rendered graph Closes #31053 See merge request !11179
*	Merge branch '32016-slash-command-strip-fix' into 'master'	Filipa Lacerda	2017-05-18	1	-6/+19
\| \| \| \| \| \| \|	Fix slash commands detection in comments Closes #32016 See merge request !11265
*	Remove unneeded media query hiding the edited timeago	Luke "Jared" Bennett	2017-05-17	3	-1/+72
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Add edited component for issue_show Added tests for issue_title_description use of edited and for edited itself Fix handling is_edited for realtime edit text Fix tests failures due to whitespace changes Update edited.vue to include required and default props
*	Merge branch 'branch-name-escape' into 'security'	Robert Speicher	2017-05-10	1	-6/+14
\| \| \| \| \| \|	Fix XSS in branches dropdown See merge request !2093
*	Merge branch '26944-prometheus-memory-sparkline' into 'master'	Fatih Acet	2017-05-09	4	-0/+400
\| \| \| \| \| \| \|	Add Prometheus memory sparkline to MR widget Closes #26944 See merge request !11209
*	Merge branch 'mr-widget-redesign-review' into 'master'	Jacob Schatz	2017-05-09	32	-244/+2732
\| \| \| \| \| \| \| \|	Merge request widget redesign Closes #25424 and #27950 See merge request !10319
*	Add Pipeline Schedules that supersedes experimental Trigger Schedule	Zeger-Jan van de Weg	2017-05-07	2	-0/+308
\|
*	Single commit squash of all changes for ↵	Kamil Trzcinski	2017-05-06	13	-68/+535
\| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878 It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
*	Colorize labels in issue search field	Winnie Hellmann	2017-05-05	3	-0/+286
\|
*	Fix Karma failures for jQuery deferreds	Kushal Pandya	2017-05-05	1	-129/+88
\|
*	Merge branch 'add-sidebar-specs' into 'master'	Jacob Schatz	2017-05-05	9	-0/+716
\|\ \| \| \| \| \| \| \| \|	Add sidebar specs See merge request !11132
\| *	Fix failing spec and eslint	Clement Ho	2017-05-05	6	-21/+27
\| \|
\| *	Add sidebar specsadd-sidebar-specs	Clement Ho	2017-05-05	9	-0/+710
\| \|
* \|	Merge branch 'mia_backort' into 'master'	Jacob Schatz	2017-05-05	10	-253/+318
\|\ \ \| \|/ \| \| \| \| \| \|	Backport of Multiple Assignees feature See merge request !11089
\| *	[skip ci] Fix FE conflicts with master	Clement Ho	2017-05-05	1	-2/+2
\| \|
\| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵	Valery Sizov	2017-05-05	15	-112/+825
\| \|\ \| \| \| \| \| \| \| \| \|	skip]
\| * \|	Fix karma	Clement Ho	2017-05-04	3	-5/+8
\| \| \|
\| * \|	Fix eslint and rubocop	Clement Ho	2017-05-04	1	-1/+1
\| \| \|
\| * \|	Backport of multiple_assignees_feature [ci skip]	Valery Sizov	2017-05-04	8	-245/+307
\| \| \|
* \| \|	Merge branch 'issue-title-description-realtime' into 'master'	Phil Hughes	2017-05-05	4	-28/+86
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render Description Realtime :tada: Closes #25049 and #31355 See merge request !10865
\| * \| \|	resolve discussionissue-title-description-realtime	Regis	2017-05-05	1	-2/+0
\| \| \| \|
\| * \| \|	fix js specs	Regis	2017-05-04	2	-59/+11
\| \| \| \|
\| * \| \|	remove fdescribe [ci skip]	Regis	2017-05-02	1	-1/+1
\| \| \| \|