2 commits

Author	SHA1	Message	Date
Jan Provaznik	a560f785f7	Store only generic message if rebase fails ... Instead of storing detailed rebase error, only a generic message is stored with MR. The reason is that this message is exposed and displayed to end user and there is no reason to expose detailed backend information. Error message is still logged so detailed information can be found in logfile by admin if needed. Related #41820	2018-01-09 17:04:28 +01:00
Jan Provaznik	27a75ea175	Backport 'Rebase' feature from EE to CE ... When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301	2018-01-05 09:34:59 +01:00