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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Break in middle of word if a span within parallel viewparallel-diff-alignment	Annabel Dunstone	2016-04-25	1	-0/+5
\|
*	Reduce width of parallel diffs	Annabel Dunstone	2016-04-22	1	-1/+5
\|
*	Fixed issue with assignee object not being returned	Phil Hughes	2016-04-22	2	-2/+2
\| \| \| \|	Closes #15515
*	Merge branch 'issue_3799' into 'master'	Rémy Coutable	2016-04-22	2	-1/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow filtering by Owned projects on dashboard page Closes #3799 ![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png) See merge request !3762
\| *	Merge remote-tracking branch 'origin/master' into issue_3799	Alfredo Sumaran	2016-04-21	176	-980/+1880
\| \|\
\| * \|	Do not display filters if user if there's no current_user	Alfredo Sumaran	2016-04-21	1	-7/+8
\| \| \|
\| * \|	Use compact syntax	Alfredo Sumaran	2016-04-21	1	-4/+1
\| \| \|
\| * \|	Allow filtering by Owned projects	Alfredo Sumaran	2016-04-18	2	-1/+14
\| \| \|
* \| \|	Merge branch 'confirmation-screen' into 'master'	Robert Speicher	2016-04-22	6	-2/+60
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved email confirmation UX Closes #4228 See merge request !3184
\| * \| \|	Improved confirmation UXconfirmation-screen	Phil Hughes	2016-04-21	6	-2/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4228
* \| \| \|	Merge branch 'rs-diff_view' into 'master'	Rémy Coutable	2016-04-22	3	-4/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always read diff_view setting from the cookie Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285 See merge request !3732
\| * \| \| \|	Clarify that the diff view setting always comes from the cookiers-diff_view	Robert Speicher	2016-04-19	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This invalidates one test, which we've removed.
\| * \| \| \|	Always read diff_view setting from the cookie	Robert Speicher	2016-04-14	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
* \| \| \| \|	Use association search in issuable create service	Grzegorz Bizon	2016-04-22	1	-6/+6
\| \| \| \| \|
* \| \| \| \|	Verify label affiliation before assigning to issue	Grzegorz Bizon	2016-04-22	1	-2/+26
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also verify if milestone belongs to correct project before creating a new issue. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439
* \| \| \|	Merge branch 'label-text-color-sidebar' into 'master'	Robert Speicher	2016-04-21	3	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes text color on labels in sidebar Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color. With this, the text color comes from the JSON. See merge request !3846
\| * \| \| \|	Reverted label link helperlabel-text-color-sidebar	Phil Hughes	2016-04-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Reverted link changes	Phil Hughes	2016-04-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Removed console.log	Phil Hughes	2016-04-21	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Fixes text color on labels in sidebar	Phil Hughes	2016-04-21	4	-5/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch '15465-fix-sort-by-due-date' into 'master'	Yorick Peterse	2016-04-21	1	-3/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the `.distinct` when finding issues See merge request !3858
\| * \| \| \| \|	Remove the `.distinct` when finding issues15465-fix-sort-by-due-date	Rémy Coutable	2016-04-21	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is not needed anymore after !3815. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'remove-update-files' into 'master'	Yorick Peterse	2016-04-21	5	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed JS update templates See merge request !3814
\| * \| \| \| \| \|	Removed JS update templatesremove-update-files	Phil Hughes	2016-04-19	5	-3/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Remove float from icon	Annabel Dunstone	2016-04-21	1	-0/+5
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce	Rémy Coutable	2016-04-21	8	-99/+76
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'label-dropdown-fix' into 'master'	Jacob Schatz	2016-04-21	8	-99/+76
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes "create label" functionality on label dropdown Issue sidebar ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) Issues page ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
\| \| * \ \ \ \	Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fix	Alfredo Sumaran	2016-04-20	42	-181/+655
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into label-dropdown-fix	Alfredo Sumaran	2016-04-20	1	-14/+11
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into label-dropdown-fix	Alfredo Sumaran	2016-04-20	145	-726/+1373
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/shared/issuable/_sidebar.html.haml
\| \| * \| \| \| \| \| \| \|	Move shared html to a partial	Alfredo Sumaran	2016-04-18	3	-34/+21
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add is-link attribute to know if a menu item should not be stopped	Alfredo Sumaran	2016-04-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove $parent	Alfredo Sumaran	2016-04-18	1	-6/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix create label functionality	Alfredo Sumaran	2016-04-15	1	-41/+25
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix Label dropdown and organize code	Alfredo Sumaran	2016-04-15	5	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/labels_select.js.coffee
\| \| * \| \| \| \| \| \| \|	Render proper partial	Alfredo Sumaran	2016-04-15	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add spaces	Alfredo Sumaran	2016-04-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Reuse partial for Create Label page	Alfredo Sumaran	2016-04-15	3	-18/+21
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Restore broken code	Alfredo Sumaran	2016-04-15	1	-9/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Rémy Coutable	2016-04-21	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'issue_15434' into 'master'	Jacob Schatz	2016-04-21	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes XSS injection REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434 Without the fix ![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif) With the fix ![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif) See merge request !1952
\| \| * \| \| \| \| \| \| \| \|	Remove unnecessary provided param	Alfredo Sumaran	2016-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Remove unused param	Alfredo Sumaran	2016-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-15408' into 'master'	Robert Speicher	2016-04-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix undefined local variable error in Invalid MR template Closes #15408 See merge request !3857
\| * \| \| \| \| \| \| \| \| \| \|	Fix undefined local variable error in Invalid MR templaters-issue-15408	Robert Speicher	2016-04-21	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15408
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'diff-link-fix' into 'master'	Jacob Schatz	2016-04-21	2	-10/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Diff highlight fixes This fixes a couple of issues with linking/highlight diff lines: - Fixed issue with lines not being selectable when expanding diff - Fixed issue with incorrect line being highlighted if line is in discussion view See merge request !3725
\| * \| \| \| \| \| \| \| \| \|	Put back removed line numberdiff-link-fix	Phil Hughes	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed issue when scrolling to element and there is an expander	Phil Hughes	2016-04-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed issue with lines not being selectable when expanding diff	Phil Hughes	2016-04-20	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed issue with incorrect line being highlighted if line is in discussion view	Phil Hughes	2016-04-20	1	-4/+4
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|