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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '41956-fix-ctrl-enter-binding-to-save-comment' into 'master'	Phil Hughes	2018-01-12	2	-2/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Ctrl+Enter keyboard shortcut saving comment/note edit Closes #41956 See merge request gitlab-org/gitlab-ce!16415
\| *	Fix Ctrl+Enter keyboard shortcut saving comment/note edit41956-fix-ctrl-enter-binding-to-save-comment	Eric Eastwood	2018-01-11	2	-2/+4
\| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956
* \|	Merge branch 'dispatcher-project-branches' into 'master'	Phil Hughes	2018-01-12	2	-4/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project branches path See merge request gitlab-org/gitlab-ce!16398
\| * \|	Refactor dispatcher project branches pathdispatcher-project-branches	Clement Ho	2018-01-11	2	-4/+10
\| \| \|
* \| \|	Refactor dispatcher projects blame and blob path	Clement Ho	2018-01-12	4	-34/+52
\| \| \|
* \| \|	Update export message to mention we can download the file from the UI	James Lopez	2018-01-12	1	-1/+1
\| \| \|
* \| \|	Merge branch 'mk-fix-permanent-redirect-validation' into 'master'	Douwe Maan	2018-01-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397
\| * \| \|	Revert "Revert "Fix Route validation for unchanged path""	Michael Kozono	2018-01-11	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	This reverts commit 3576d59ae95a61dd20e997a619dbc6c8e8a70276.
* \| \|	fix case where tooltip messes up :last-child selector37077-subscribe-button-tooltip-on-issues-page-causes-visual-stuttering	Mike Greiling	2018-01-11	1	-1/+1
\| \| \|
* \| \|	Merge branch 'sh-remove-import-retry-count-warning' into 'master'	Robert Speicher	2018-01-11	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove warning noise in ProjectImportOptions See merge request gitlab-org/gitlab-ce!16410
\| * \| \|	Remove warning noise in ProjectImportOptions	Stan Hu	2018-01-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squlches these warnings: ``` /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: already initialized constant ProjectImportOptions::IMPORT_RETRY_COUNT /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: previous definition of IMPORT_RETRY_COUNT was here ```
* \| \| \|	Merge branch 'dispatcher-dashboard-mr' into 'master'	Fatih Acet	2018-01-11	2	-3/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher dashboard mr path See merge request gitlab-org/gitlab-ce!16360
\| * \| \| \|	Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mr	Clement Ho	2018-01-10	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Refactor dispatcher dashboard mr path	Clement Ho	2018-01-10	2	-2/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dispatcher-boards' into 'master'	Fatih Acet	2018-01-11	2	-2/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project boards path See merge request gitlab-org/gitlab-ce!16374
\| * \| \| \| \|	Refactor dispatcher project boards pathdispatcher-boards	Clement Ho	2018-01-10	2	-2/+11
\| \|/ / / /
* \| \| \| \|	Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master'	Fatih Acet	2018-01-11	1	-6/+7
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve wording about additional costs with Ingress on GKE or custom clusters Closes #41163 See merge request gitlab-org/gitlab-ce!16370
\| * \| \| \|	Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-language	Eric Eastwood	2018-01-11	1	-6/+7
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41163
* \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2018-01-11	1	-1/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master' into 'master' Fix padding for pipeline dropdowns after bad merge Closes #41221 See merge request gitlab-org/gitlab-ce!15982
\| * \| \| \|	Remove wrong padding from pipelines.scss41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master	Winnie Hellmann	2017-12-18	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'main-js-tidy-up' into 'master'	Filipa Lacerda	2018-01-11	23	-129/+123
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tidy up main JS file See merge request gitlab-org/gitlab-ce!16007
\| * \| \| \|	Tidy up main JS filemain-js-tidy-up	Phil Hughes	2018-01-10	23	-129/+123
\| \| \| \| \|
* \| \| \| \|	Merge branch 'help-profiles-dispatcher-refactor' into 'master'	Phil Hughes	2018-01-11	4	-11/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored profile:* and help:* imports in dispatcher See merge request gitlab-org/gitlab-ce!16330
\| * \ \ \ \	Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactor	Constance Okoghenun	2018-01-11	252	-5276/+6136
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Removed experimental feature flag unsed depenecy for profiles/preferences	Constance Okoghenun	2018-01-11	2	-9/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactored profile:* and help:* imports in dispatcher	Constance Okoghenun	2018-01-09	5	-6/+27
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Adds Rubocop rule for line break around conditionals	🙈 jacopo beschi 🙉	2018-01-11	31	-0/+35
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'projects-dispatcher-refactor' into 'master'	Phil Hughes	2018-01-11	4	-20/+42
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored project:n* imports in dispatcher.js See merge request gitlab-org/gitlab-ce!16382
\| * \| \| \| \| \| \|	Refactored project:n* imports in dispatcher.js	Constance Okoghenun	2018-01-11	4	-20/+42
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'remove-soft-removals' into 'master'	Douwe Maan	2018-01-11	10	-22/+13
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
\| * \| \| \| \| \| \|	Remove soft removals related code	Yorick Peterse	2018-01-08	10	-22/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
* \| \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2018-01-11	3	-3/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40920-emphasize-irreversibility-in-warning-message-when-promoting-labels-and-milestones' into 'master' Emphasize irreversibility in warning message when promoting labels and milestones Closes #40920 See merge request gitlab-org/gitlab-ce!16333
\| * \| \| \| \| \| \|	Changed copy text for promoting the milestone and labels40920-emphasize-irreversibility-in-warning-message-when-promoting-labels-and-milestones	Jose Ivan Vargas	2018-01-10	3	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'qa/gb/define-project-pages-selectors' into 'master'	Rémy Coutable	2018-01-11	3	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define QA project pages views / selectors See merge request gitlab-org/gitlab-ce!16391
\| * \| \| \| \| \| \| \|	Add selectors coupling for QA project show page objectqa/gb/define-project-pages-selectors	Grzegorz Bizon	2018-01-11	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Define QA project pages views / selectors	Grzegorz Bizon	2018-01-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '41608-clipboard-vue-button' into 'master'	Phil Hughes	2018-01-11	1	-1/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "clipboard-button tooltip is broken" Closes #41608 See merge request gitlab-org/gitlab-ce!16352
\| * \| \| \| \| \| \| \| \|	Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-button	Filipa Lacerda	2018-01-11	1	-0/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add tooltip missing to clipboard component	Filipa Lacerda	2018-01-10	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds tests
* \| \| \| \| \| \| \| \| \|	Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master'	Rémy Coutable	2018-01-11	1	-6/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve ""New branch" and "New tag" actions are pointless on an empty repository" Closes #39988 See merge request gitlab-org/gitlab-ce!16332
\| * \| \| \| \| \| \| \| \| \|	Hide new branch and tag links for projects with an empty repo	Mark Fletcher	2018-01-09	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '38068-commits-count' into 'master'	Yorick Peterse	2018-01-11	1	-4/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store the number of merge request commits in merge_request_diffs.commits_count" Closes #38068 See merge request gitlab-org/gitlab-ce!16164
\| * \| \| \| \| \| \| \| \| \|	Denormalize commits count for merge request diffs38068-commits-count	Jan Provaznik	2018-01-10	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For each MR diff an extra 'SELECT COUNT()' is executed to get number of commits for the diff. Overall time to get counts for all MR diffs may be quite expensive. To speed up loading of MR info, information about number of commits is stored in a MR diff's extra column. Closes #38068
* \| \| \| \| \| \| \| \| \| \|	Merge branch '41613-fix-redundant-modal' into 'master'	Filipa Lacerda	2018-01-11	2	-66/+68
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make modal dialog common for Groups tree app Closes #41613 See merge request gitlab-org/gitlab-ce!16311
\| * \| \| \| \| \| \| \| \| \| \|	Add modal dialog for leave group action	Kushal Pandya	2018-01-11	1	-11/+37
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Move modal dialog to app root component	Kushal Pandya	2018-01-11	1	-55/+31
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵	Grzegorz Bizon	2018-01-11	1	-6/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
\| * \| \| \| \| \| \| \| \| \| \| \|	Never set special MR titles for external issues	Sean McGivern	2018-01-10	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect default merge request title when external issue tracker is ↵	Benedikt Huss	2018-01-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activated
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4020-rebase-message' into 'master'	Sean McGivern	2018-01-11	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.' Closes #41820 See merge request gitlab-org/gitlab-ce!16326