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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update icon to match EEvue-mr-widget-state	Filipa Lacerda	2018-01-19	1	-1/+1
\|
*	Merge branch 'master' into vue-mr-widget-state	Filipa Lacerda	2018-01-19	205	-2516/+3797
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (39 commits) WebIDE: Fix Commit bugs Resolve "Projects API: filter 'with_issues_enabled=true' returns projects with 'issues_enabled=false'" Fix incorrect path for gitlab-shell authorized keys helper Fix duplicate item in protected branch/tag dropdown dynamic imports for groups: pages Refactor dispatcher project mr edit and creation diff path Refactor dispatcher project mr creations new path Rework indexes on redirect_routes to be more effective and enforce a case insensitive unique path Upgraded Karma Dependencies Fix conflict with ee icon Remove trailing space after author name in note header Delete conflicting orphaned routes Make the 'Edit' links consistent in the issuable sidebar Fix a bug calculating artifact size for project statistics Update rubocop, rubocop-rspec, and gitlab-styles Correctly escape UTF-8 path elements for uploads Change cursor to default for disabled buttons Fix eslint Remove Event listener and make code more readable. Update CHANGELOG.md for 10.1.7 ...
\| *	Merge branch 'fix-redirect-routes-schema' into 'master'	Yorick Peterse	2018-01-19	4	-3/+76
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	rework indexes on redirect_routes See merge request gitlab-org/gitlab-ce!16211
\| \| *	Rework indexes on redirect_routes to be more effective and enforce a case ↵fix-redirect-routes-schema	Greg Stark	2018-01-18	4	-3/+76
\| \| \| \| \| \| \| \| \| \| \| \|	insensitive unique path
\| * \|	Merge branch 'mr-widget-vue' into 'master'	Phil Hughes	2018-01-19	5	-39/+60
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-39/+60
\| \| \| \|
\| * \| \|	Merge branch '41532-email-reason' into 'master'	Sean McGivern	2018-01-19	17	-94/+288
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	17	-94/+288
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'sh-fix-authorized-keys-docs' into 'master'	Nick Thomas	2018-01-19	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect path for gitlab-shell authorized keys helper See merge request gitlab-org/gitlab-ce!16571
\| \| * \| \| \|	Fix incorrect path for gitlab-shell authorized keys helpersh-fix-authorized-keys-docs	Stan Hu	2018-01-18	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '26296-update-styling-disabled-buttons' into 'master'	Phil Hughes	2018-01-19	6	-19/+44
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-16/+21
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update styling of all disabled buttons	Annabel Dunstone Gray	2018-01-16	5	-13/+33
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'tz-fix-ide-bugs' into 'master'	Phil Hughes	2018-01-19	25	-77/+169
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WebIDE: Fix Commit bugs See merge request gitlab-org/gitlab-ce!16459
\| \| * \| \| \| \| \|	WebIDE: Fix Commit bugs	Tim Zallmann	2018-01-19	25	-77/+169
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master'	Phil Hughes	2018-01-19	4	-1/+135
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-1/+135
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/42157 Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41989
\| * \| \| \| \| \| \|	Merge branch 'fix-derefenced-target' into 'master'	Douwe Maan	2018-01-19	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dereferenced_target naming in Gitlab::Git::Ref initialize See merge request gitlab-org/gitlab-ce!16504
\| \| * \| \| \| \| \| \|	Fix dereferenced_target naming in Gitlab::Git::Ref initialize	Serdar Dogruyol	2018-01-17	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'fix-description-loss' into 'master'	Phil Hughes	2018-01-19	2	-0/+51
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+49
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '42159-utf8-uploads' into 'master'	Douwe Maan	2018-01-19	3	-11/+17
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly escape UTF-8 path elements for uploads Closes #42159 See merge request gitlab-org/gitlab-ce!16560
\| \| * \| \| \| \| \| \| \| \|	Correctly escape UTF-8 path elements for uploads	Nick Thomas	2018-01-18	3	-11/+17
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '34055-issues-enabled-filter-misbehavior' into 'master'	James Lopez	2018-01-19	4	-2/+35
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Projects API: filter 'with_issues_enabled=true' returns projects with 'issues_enabled=false'" Closes #34055 See merge request gitlab-org/gitlab-ce!12724
\| \| * \| \| \| \| \| \| \| \|	Resolve "Projects API: filter 'with_issues_enabled=true' returns projects ↵	Jan Christophersen	2018-01-19	4	-2/+35
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dispatcher-groups' into 'master'	Jacob Schatz	2018-01-18	17	-75/+149
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dynamic imports for groups: pages See merge request gitlab-org/gitlab-ce!16342
\| \| * \| \| \| \| \| \| \| \| \|	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	3	-1/+12
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '42187-update-gitlab-styles-to-2-3-0' into 'master'	Robert Speicher	2018-01-18	5	-86/+75
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update gitlab-styles to 2.3.0" Closes #42187 See merge request gitlab-org/gitlab-ce!16558
\| \| * \| \| \| \| \| \| \| \| \| \|	Update rubocop, rubocop-rspec, and gitlab-styles42187-update-gitlab-styles-to-2-3-0	Rémy Coutable	2018-01-18	5	-86/+75
\| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '41247-timestamp' into 'master'	Robert Speicher	2018-01-18	5	-24/+58
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-24/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dispatcher-projects-mr-creation-new' into 'master'	Jacob Schatz	2018-01-18	2	-14/+21
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project mr creations new path See merge request gitlab-org/gitlab-ce!16403
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project mr creations new path	Clement Ho	2018-01-18	2	-14/+21
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'tz-karma-libraries-upgrade' into 'master'	Filipa Lacerda	2018-01-18	3	-234/+1259
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgraded Karma Dependencies See merge request gitlab-org/gitlab-ce!16402
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Upgraded Karma Dependencies	Tim Zallmann	2018-01-18	3	-234/+1259
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rc/improve-mr-feature-specs' into 'master'	Robert Speicher	2018-01-18	60	-1748/+1087
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve MR feature specs and reduce duplication See merge request gitlab-org/gitlab-ce!13237
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specs	Rémy Coutable	2018-01-18	60	-1748/+1087
\| \| \| \|_\|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jramsay-3953-fast-ssh-ce-docs' into 'master'	Marcia Ramos	2018-01-18	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add release added and release backported to CE See merge request gitlab-org/gitlab-ce!16553