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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix bug in webpack_helper in which force_same_domain argument was ignored ↵fix-local-rspec-tests	Mike Greiling	2018-01-25	1	-1/+1
\| \| \| \|	breaking local rspec tests
*	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
\| * \| \| \| \| \| \| \|	Add EE version and CE issue linkjramsay-3953-fast-ssh-ce-docs	James Ramsay	2018-01-18	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add release added and release backported to CE	James Ramsay	2018-01-18	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'	Stan Hu	2018-01-18	3	-0/+79
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete conflicting orphaned routes before validation Closes #39551 See merge request gitlab-org/gitlab-ce!16242
\| * \| \| \| \| \| \| \| \|	Delete conflicting orphaned routes	Michael Kozono	2018-01-18	3	-0/+79
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'background-migration-fix' into 'master'	Douwe Maan	2018-01-18	3	-3/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce UPDATEs for background column type changes Closes #42158 See merge request gitlab-org/gitlab-ce!16551
\| * \| \| \| \| \| \| \|	Reduce UPDATEs for background column type changesbackground-migration-fix	Yorick Peterse	2018-01-18	3	-3/+6
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to this commit we would essentially update all rows in a table, even those where the source column (e.g. `issues.closed_at`) was NULL. This in turn could lead to statement timeouts when using the default batch size of 10 000 rows per job. To work around this we don't schedule jobs for rows where the source value is NULL. We also don't update rows where the source column is NULL (as an extra precaution) or the target column already has a non-NULL value. Using this approach it should be possible to update 10 000 rows in the "issues" table in about 7.5 - 8 seconds. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/42158
* \| \| \| \| \| \| \|	Merge branch 'docs/runners-clear-cache' into 'master'41938-create-merge-request-from-issue-page-styling-broken-and-source-dropdown-broken	Marcia Ramos	2018-01-18	1	-0/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cache clearing documentation Closes #41940 See merge request gitlab-org/gitlab-ce!16559
\| * \| \| \| \| \| \| \|	Add cache clearing documentation	Achilleas Pipinellis	2018-01-18	1	-0/+22
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_37143_2' into 'master'	Sean McGivern	2018-01-18	5	-2/+42
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-2/+42
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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	21	-55/+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	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \|