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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix eslintprojects-r-s	Clement Ho	2018-01-19	1	-2/+0
\|
*	Merge branch 'master' into projects-r-s	Clement Ho	2018-01-19	46	-204/+420
\|\
\| *	Merge branch 'fix/add-horizontal-scroll-to-wiki-tables' into 'master'	Annabel Dunstone Gray	2018-01-19	1	-0/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add horizontal scroll to wiki tables #26557 See merge request gitlab-org/gitlab-ce!16527
\| \| *	Add horizontal scroll to wiki tables	George Tsiolis	2018-01-19	1	-0/+2
\| \| \|
\| * \|	Merge branch 'mr-widget-vue' into 'master'	Phil Hughes	2018-01-19	4	-27/+35
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move archived component to vue file See merge request gitlab-org/gitlab-ce!16561
\| \| * \|	Fix conflict with ee iconmr-widget-vue	Filipa Lacerda	2018-01-18	1	-1/+1
\| \| \| \|
\| \| * \|	Move archived component to vue file	Filipa Lacerda	2018-01-18	4	-27/+35
\| \| \| \|
\| * \| \|	Merge branch '41532-email-reason' into 'master'	Sean McGivern	2018-01-19	10	-89/+132
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
\| \| * \| \|	Initial work to add notification reason to emails	Mario de la Ossa	2018-01-16	10	-89/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
\| * \| \| \|	Merge branch '26296-update-styling-disabled-buttons' into 'master'	Phil Hughes	2018-01-19	5	-19/+39
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Review styling of disabled buttons" Closes #26296 See merge request gitlab-org/gitlab-ce!16501
\| \| * \| \| \|	Change cursor to default for disabled buttons26296-update-styling-disabled-buttons	Annabel Dunstone Gray	2018-01-18	2	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Remove hover states from disabled buttons	Annabel Dunstone Gray	2018-01-17	1	-16/+16
\| \| \| \| \| \|
\| \| * \| \| \|	Update styling of all disabled buttons	Annabel Dunstone Gray	2018-01-16	5	-13/+33
\| \| \|/ / /
\| * \| \| \|	WebIDE: Fix Commit bugs	Tim Zallmann	2018-01-19	20	-57/+148
\| \| \| \| \|
\| * \| \| \|	Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master'	Phil Hughes	2018-01-19	1	-1/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate item in protected branch/tag dropdowns Closes #42157 and #41989 See merge request gitlab-org/gitlab-ce!16540
\| \| * \| \| \|	Fix duplicate item in protected branch/tag dropdown42157-41989-fix-duplicate-in-create-item-dropdown	Eric Eastwood	2018-01-18	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/42157 Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41989
\| * \| \| \| \|	Merge branch 'fix-description-loss' into 'master'	Phil Hughes	2018-01-19	1	-0/+18
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confirm when navigating away from page Closes #42102 See merge request gitlab-org/gitlab-ce!16518
\| \| * \| \| \| \|	Fix eslintfix-description-loss	Jacob Schatz	2018-01-18	1	-4/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove Event listener and make code more readable.	Jacob Schatz	2018-01-18	1	-4/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add confirm when navigating away from page with tests.	Jacob Schatz	2018-01-18	1	-0/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Resolve "Projects API: filter 'with_issues_enabled=true' returns projects ↵	Jan Christophersen	2018-01-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with 'issues_enabled=false'"
\| * \| \| \| \| \|	Merge branch 'dispatcher-project-mr-edit' into 'master'	Jacob Schatz	2018-01-19	4	-11/+34
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project mr edit and creation diff path See merge request gitlab-org/gitlab-ce!16404
\| \| * \| \| \| \| \|	Refactor dispatcher project mr edit and creation diff path	Clement Ho	2018-01-18	4	-11/+34
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add secretVariable test	Clement Ho	2018-01-19	1	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix eslint	Clement Ho	2018-01-19	1	-3/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into 'projects-r-s'	Clement Ho	2018-01-19	27	-102/+192
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/dispatcher.js
\| * \| \| \| \| \| \|	dynamic imports for groups: pages	Simon Knox	2018-01-18	17	-75/+149
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '42154-fix-artifact-size-calc' into 'master'	Robert Speicher	2018-01-18	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Bug calculating artifacts size for project statistics" Closes #42154 See merge request gitlab-org/gitlab-ce!16539
\| \| * \| \| \| \| \| \|	Fix a bug calculating artifact size for project statistics	Nick Thomas	2018-01-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '41247-timestamp' into 'master'	Robert Speicher	2018-01-18	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use last_edited_at instead of updated_at for displaying issuable last change Closes #41247 See merge request gitlab-org/gitlab-ce!16406
\| \| * \| \| \| \| \| \| \|	Return last edited time instead of update time41247-timestamp	Jan Provaznik	2018-01-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For issuable models we keep two timestamps: updated_at which is updated whenever any model attribute is changed, last_edited_at which is changed when only title or description is changed. In UI bellow description we display who and when updated the item. But last_edited_by (used for 'who') is mistakenly combined with updated_at (when), last_edited_at should be used instead. Closes #41247
\| * \| \| \| \| \| \| \| \|	Merge branch '42190-make-edit-labels-in-the-issuable-sidebar-consistent' ↵	Clement Ho	2018-01-18	4	-6/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve ""Edit" labels in the issuable sidebar are not consistent" Closes #42190 See merge request gitlab-org/gitlab-ce!16565
\| \| * \| \| \| \| \| \| \| \|	Make the 'Edit' links consistent in the issuable sidebar42190-make-edit-labels-in-the-issuable-sidebar-consistent	Rémy Coutable	2018-01-18	4	-6/+6
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Refactor dispatcher project mr creations new path	Clement Ho	2018-01-18	2	-14/+21
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '42186-username-trailing-space' into 'master'	Filipa Lacerda	2018-01-18	1	-3/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Comment author link text has a trailing space" Closes #42186 See merge request gitlab-org/gitlab-ce!16567
\| \| * \| \| \| \| \| \| \|	Remove trailing space after author name in note header	Annabel Dunstone Gray	2018-01-18	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Delete conflicting orphaned routes	Michael Kozono	2018-01-18	1	-0/+12
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix reference	Clement Ho	2018-01-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix eslint	Clement Ho	2018-01-18	5	-16/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Code improvements	Clement Ho	2018-01-18	8	-25/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	[skip ci] Improve dispatcher	Clement Ho	2018-01-18	1	-10/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add rest of refactor of dispatcher for project:s*	Jacob Schatz	2018-01-18	4	-23/+51
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Refactor for projects:s	Jacob Schatz	2018-01-18	6	-4/+53
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	refactor for projects-r*	Jacob Schatz	2018-01-18	2	-2/+10
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'issue_37143_2' into 'master'	Sean McGivern	2018-01-18	3	-2/+8
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
\| * \| \| \| \| \| \|	Remove unnecessary query from labels filter	Felipe Artur	2018-01-18	3	-2/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '41806-pipeline-jumping' into 'master'	Annabel Dunstone Gray	2018-01-18	3	-5/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Pipeline stages are jumping when dropdown is open" Closes #41806 See merge request gitlab-org/gitlab-ce!16556
\| * \| \| \| \| \| \| \|	Increase pipeline mini graph width41806-pipeline-jumping	Filipa Lacerda	2018-01-18	3	-5/+5
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dispatcher-projects' into 'master'	Filipa Lacerda	2018-01-18	20	-54/+56
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added dispatcher imports for some project routes See merge request gitlab-org/gitlab-ce!16389
\| * \| \| \| \| \| \| \|	added project_new importdispatcher-projects	Phil Hughes	2018-01-17	2	-2/+2
\| \| \| \| \| \| \| \| \|